From 2d6afa83c3e4932627a3eb4fb3795a489958f694 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 01 Mar 2007 04:17:05 +0000
Subject: [PATCH] Update all CDDL headers in source files to remove a typo.

---
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/package-info.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/DirectoryServerMBean.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java                                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/ProtocolMessages.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/args/FileBasedArgument.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java                                                              |    2 
 opendj-sdk/opends/resource/bin/export-ldif.bat                                                                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java                                                                      |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java                         |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml                                          |    2 
 opendj-sdk/opends/resource/bin/ldappasswordmodify.bat                                                                                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/TextWriter.java                                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif              |    4 
 opendj-sdk/opends/resource/bin/stop-ds.bat                                                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/package-info.java                                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java                                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif                                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java                                                          |    2 
 opendj-sdk/opends/resource/schema/01-pwpolicy.ldif                                                                                              |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_BASE64.ldif                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml                                             |    2 
 opendj-sdk/opends/resource/schema/02-config.ldif                                                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlProvider.java                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java                             |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/package-info.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/ActionType.java                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java                                                 |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/TaskMessages.java                                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConstants.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd4.ldif                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java                                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java                    |    4 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java                                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/LastNameTag.java                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/package-info.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportThread.java                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java                                         |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif                                                  |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java                                                           |    2 
 opendj-sdk/opends/build.xml                                                                                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileFormatter.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/CertificateValidationPolicy.java                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java                                          |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ConfirmUninstallPanel.java                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml                                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/interop/package-info.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif                            |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartDownloader.java                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciProvider.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/PresenceTag.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_enable_sasl_anon.ldif                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java                                                                      |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateEvent.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/package-info.java                                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif                                                   |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchEntryPluginResultTestCase.java                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/deleteTrustMgr.ldif             |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/Operation.java                                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif                                          |    4 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java                                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/PostRotationAction.java                                                                  |    2 
 opendj-sdk/opends/resource/bin/ldifmodify.bat                                                                                                   |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif                          |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java                |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java                |    4 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusDescriptor.java                                                            |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_key_mgr_provider.ldif    |    4 
 opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyConfig.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif                                          |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexFilter.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif                                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/LDIFPluginResultTestCase.java                                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/InvokableComponent.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/UtilityMessages.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java                              |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml                                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif              |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java                                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java                                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java                |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java                                    |    4 
 opendj-sdk/opends/build-tools/src/org/opends/build/tools/PrepTestNG.java                                                                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java                                               |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif                                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java                                                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif                                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java                                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java              |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java                                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/backends/Example.ldif                                                                      |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif                                      |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/LockType.java                                                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexConfig.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java                                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorRange.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/RotationActionThread.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java                                               |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java                              |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif                                                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java                                                                     |    2 
 opendj-sdk/opends/resource/FindJavaHome.java                                                                                                    |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif                                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearchOptions.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java                                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationBindOperation.java                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif                                                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java                                |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/package-info.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationOperation.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif                                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceSettings.java                                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java                                                               |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeListener.java                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_ldaps_conn_handler.ldif                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif                          |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallDataException.java                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/RDN.java                                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java                                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java        |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateListener.java                                                 |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif                            |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_mod.ldif                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_xml.java                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java                                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif                                                             |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java                                           |    6 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnection.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/monitors/package-info.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/ExtensionsConstants.java                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif                                                    |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java                  |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java                                                                          |    2 
 opendj-sdk/opends/resource/schema/03-uddiv3.ldif                                                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/SearchScope.java                                                                           |    2 
 opendj-sdk/opends/resource/bin/verify-index                                                                                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java                                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java                                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/TimeStampNaming.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/package-info.java                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AttributeValueDecoder.java                                                                   |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallData.java                                                           |    2 
 opendj-sdk/opends/resource/schema/03-changelog.ldif                                                                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/PluginMessages.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif                                                                |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogFormatter.java                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java                            |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java                         |    4 
 opendj-sdk/opends/resource/bin/_client-script.sh                                                                                                |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif                                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportContext.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/TestFileList.java                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java                                               |    2 
 opendj-sdk/opends/resource/bin/ldifmodify                                                                                                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java                                          |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ProgressDialog.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java                                                          |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/SortableTableModel.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif                                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java                                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif                                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/Logger.java                                                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif                       |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif                                                |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java                       |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/package-info.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java                                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif                                        |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm2.ldif                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java                                               |    2 
 opendj-sdk/opends/resource/bin/_server-script.bat                                                                                               |    4 
 opendj-sdk/opends/resource/bin/stop-ds                                                                                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Null.java                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java                           |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/OperatingSystem.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/ZIPAction.java                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/RFC3672SubtreeSpecification.java                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif                                     |    4 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif                                                                |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java                                      |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif                                      |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/AsyncronousLogPublisher.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java                                |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-format.ldif                              |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/FileNamingPolicy.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreOperationPluginResultTestCase.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_trust_mgr_provider.ldif                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyWarningType.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif                           |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecificationSet.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/staf-installer.xml                                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/NullOutputStream.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Config.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/RetentionPolicy.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif                                               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java                                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif                            |    4 
 opendj-sdk/opends/resource/bin/encode-password                                                                                                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java                      |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java                                                            |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif                      |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestAccessLogger.java                                                    |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/i18n/ResourceProvider.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java                                                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/package-info.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/backends/Include.ldif                                                                      |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_startTLS.ldif                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/CancelResult.java                                                                          |    2 
 opendj-sdk/opends/resource/bin/_client-script.bat                                                                                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif                                                     |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java                              |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSMgr.java                                                    |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java                                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java                      |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/DereferencePolicy.java                                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/InProgressOperation.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/FileComparator.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/backends/Exclude.ldif                                                                      |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMod.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_CLEAR.ldif                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif                                                              |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif                                                        |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java                            |    4 
 opendj-sdk/opends/resource/bin/ldapcompare                                                                                                      |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompareOptions.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java                                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif                                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java                                                                       |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ListenersTableModel.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java                                                                               |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java                                                           |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_many_schemes.ldif                                           |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/i18n/ResourceProvider.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugErrorHandler.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif                                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java                                                                           |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java                                                                 |    2 
 opendj-sdk/opends/resource/schema/03-rfc2713.ldif                                                                                               |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif                                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchListener.java                                                   |    2 
 opendj-sdk/opends/resource/bin/ldapmodify.bat                                                                                                   |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif                                             |    4 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/DisconnectReason.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java                                                             |    2 
 opendj-sdk/opends/resource/bin/ldappasswordmodify                                                                                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/package-info.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif                          |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/JnlpProperties.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/ProtocolElement.java                                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketReadThread.java                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/ExtensionsMessages.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogSeverity.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif                                                              |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml                                                  |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java                                                |    2 
 opendj-sdk/opends/resource/bin/status                                                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java                                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAddOperation.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyOperation.java                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java                          |    4 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/StatusPanelButtonListener.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Indexer.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseOperation.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/ChangeOperationType.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif                                                                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostOperationPluginResultTestCase.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolOptions.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/CoreConstants.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/Entry.java                                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FirstNameTag.java                                                                 |    2 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java                                                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java                                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AcceptRejectWarn.java                                                                      |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/SplashScreen.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml                                                                           |    2 
 opendj-sdk/opends/resource/bin/restore                                                                                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java                                  |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java                |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/RotationPolicy.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Longs.java                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif                                  |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeReader.java                                                                    |    2 
 opendj-sdk/opends/resource/bin/restore.bat                                                                                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif                                             |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml                                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif                                                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_SSHA.ldif                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif                           |    4 
 opendj-sdk/opends/resource/bin/import-ldif                                                                                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java                                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif                                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java                                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif               |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif                         |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif                                   |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif                                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif                                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java                                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttribute.java                                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java                                                                           |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallException.java                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif                                                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/args/package-info.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/common/package-info.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java                                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif                                    |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java                                       |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/sales_pwd_policy.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ErrorLogger.java                                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/DebugLogLevel.java                                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_TLS.ldif                 |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java                                   |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModifyOptions.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java                                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif                                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_tls_mod.ldif                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/CoreMessages.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/AccessControlHandler.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java                                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionOptions.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateFile.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif                                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java                                                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchReferencePluginResultTestCase.java                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java                                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-attr.ldif                                |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java                                     |    4 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/NamespacePrefixMapperImpl.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryID.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/ConfigAddListener.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/DNTag.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_disable_sasl_anon.ldif                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java                                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/FailedDependencyAction.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DataConfig.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java                                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseCompareOperation.java                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/SchemaFileElement.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml                                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java                                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif                             |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IDSetIterator.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java                                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/FilterType.java                                                                            |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServerShutdownHook.java                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java                                                 |    2 
 opendj-sdk/opends/build-tools/src/javax/jnlp/ServiceManager.java                                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif                                                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/package-info.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/rm_sales_pwd_policy.ldif                                               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif                                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif                                            |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif                                                                |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif                                      |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java                                                                           |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java                        |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml                                                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LogLevel.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/args/Argument.java                                                                          |    2 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif                                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java                                                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java                                 |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java                                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexModComparator.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/DebugLogCategory.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java                                                 |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartTests.java                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostConnectPluginResultTestCase.java                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java                                                       |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java                |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentException.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java                                                 |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif                                          |    4 
 opendj-sdk/opends/resource/bin/ldif-diff.bat                                                                                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java                                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AlertGenerator.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateLine.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/package-info.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_key_mgr_provider.ldif                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif                                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java                                                     |    2 
 opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadService.java                                                                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif                                |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml                                            |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressDescriptor.java                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif                                                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_trust_mgr_provider.ldif                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java                                                                          |    2 
 opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckEOLStyle.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportJob.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd3.ldif                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OctetStringKeyComparator.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/Privilege.java                                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java                 |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java                                                                          |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java                                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java                                                                |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/DatabaseDescriptor.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/KeyManagerProvider.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd.ldif                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java                                                   |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/DatabasesTableModel.java                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/backends/Schema.ldif                                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java                                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java                         |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java                                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/Error.java                                                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif                                                     |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java                                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java                                                           |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java               |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceConfiguration.java                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreParsePluginResultTestCase.java                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java                                                                      |    2 
 opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadServiceListener.java                                                                       |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java                                 |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java                                |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/args/IntegerArgument.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java                                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif                           |    4 
 opendj-sdk/opends/resource/bin/ldapmodify                                                                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java                         |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java        |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java                                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java                                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java                |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_startup.ldif                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java                                     |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/ConfigDeleteListener.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/build.xml                                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd6.ldif                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif                                                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java                                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java                                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/DuplicateMessageIDsTestCase.java                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileHandler.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java                                        |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/GZIPAction.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif                                                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/LazyDNTestCase.java                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ConnectionSecurityProvider.java                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml                                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif                                                             |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java                                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java                    |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java                                         |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumRight.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AccessControlProvider.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerAlarmHandler.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java                                              |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif                                                              |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/config/package-info.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseBindOperation.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorAllIds.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml                                                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif                         |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif                                              |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java                            |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif                        |    4 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelLauncher.java                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif                                            |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif                                                            |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/EntryWriter.java                                                                  |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/SplashScreen.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java                                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif                            |    4 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_trust_mgr_provider.ldif  |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java                                         |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif                                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Tag.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/Schema.java                                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java                                               |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif                    |    4 
 opendj-sdk/opends/resource/schema/03-rfc3712.ldif                                                                                               |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml                                                               |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeValue.java                                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciException.java                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java                             |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryLogLevel.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/package-info.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd5.ldif                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java                            |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java                                                            |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/FieldName.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestErrorLogger.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif                             |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif                                     |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/Modification.java                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif                                            |    4 
 opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckCopyrightDates.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java                                                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketWriteThread.java                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/package-info.java                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_by_time.ldif                                     |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java                                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif              |    4 
 opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml                                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/README                                                                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyErrorType.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationOperation.java                                                      |    2 
 opendj-sdk/opends/resource/bin/backup                                                                                                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/SSLClientAuthPolicy.java                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java                                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java                                                                     |    2 
 opendj-sdk/opends/tests/oulu-tests/build.xml                                                                                                    |    4 
 opendj-sdk/opends/build-tools/src/javax/jnlp/UnavailableServiceException.java                                                                   |    4 
 opendj-sdk/opends/resource/bin/ldifsearch.bat                                                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml                                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobTests.java                                     |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java                                   |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java                                                                 |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaTests.java                               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java                                                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PluginOperation.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java                                                          |    2 
 opendj-sdk/opends/resource/schema/04-rfc2307bis.ldif                                                                                            |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml                                                                                  |    2 
 opendj-sdk/opends/resource/bin/ldapdelete.bat                                                                                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/PresenceIndexer.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java                                               |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/LoginDialog.java                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java                                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/CommonSchemaElements.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif                                              |    4 
 opendj-sdk/opends/build-tools/src/org/opends/build/tools/CoverageDiff.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java                                                    |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif                                                               |    2 
 opendj-sdk/opends/resource/schema/03-rfc2926.ldif                                                                                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LogRecord.java                                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml                                                                             |    2 
 opendj-sdk/opends/resource/bin/statuspanel.bat                                                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ModificationType.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ConditionResult.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml                                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/java/xmlToHtml/xmlToHtml.java                                                                   |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml                            |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolUtils.java                                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java                                                     |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRelativeSubtreeSpecification.java                               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseOperation.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java                                    |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java                                                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java                                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java                                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif                                     |    4 
 opendj-sdk/opends/resource/config/config.ldif                                                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif                                                                |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexBuilder.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LogCategory.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java                                       |    4 
 opendj-sdk/opends/resource/bin/setcp.bat                                                                                                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif                                                                |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif                                     |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif                              |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java                                                     |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_tls_in.ldif                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseAddOperation.java                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/InteropTestCase.java                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif                                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java                                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullConnectionSecurityProviderTestCase.java                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java                                             |    2 
 opendj-sdk/opends/resource/setup.bat                                                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/GUIDTag.java                                                                      |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateEvent.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java                                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif                                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java                                                      |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif                                                           |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif                                          |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java                                     |    2 
 opendj-sdk/opends/resource/schema/03-rfc3112.ldif                                                                                               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java                      |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/OperationType.java                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/internal/package-info.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif                            |    4 
 opendj-sdk/opends/resource/bin/list-backends                                                                                                    |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml                                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif                              |    4 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusPooler.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java                                                     |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/LogPublisher.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java                                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/TrustManagerProvider.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java                                                                  |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressStep.java                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif                                             |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif                                                         |    2 
 opendj-sdk/opends/build-tools/src/windows/winlauncher.h                                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java                                                   |    2 
 opendj-sdk/opends/build-tools/src/windows/winlauncher.c                                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/package-info.java                                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java                                                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif                    |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostDisconnectPluginResultTestCase.java                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestAbsoluteSubtreeSpecification.java                               |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif                      |    4 
 opendj-sdk/opends/resource/bin/start-ds.bat                                                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif                                       |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif                                      |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/URLWorker.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java                                                             |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif                                     |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_TLS.ldif                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java                                         |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java                      |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif                                                                |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java                                     |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/EncryptAction.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/package-info.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_reset_authzid_attr.ldif                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/SelectableCertificateKeyManager.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ConfigurableComponent.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/Base64.java                                                                                 |    2 
 opendj-sdk/opends/resource/bin/backup.bat                                                                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AttributeUsage.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2Entry.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml                                                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BufferedIndex.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif                        |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif                          |    4 
 opendj-sdk/opends/resource/bin/ldapdelete                                                                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif                                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_authzid_attr.ldif                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java                                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif                                      |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java                                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/args/StringArgument.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/backends/Append.ldif                                                                       |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RandomTag.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java                               |    2 
 opendj-sdk/opends/resource/bin/_server-script.sh                                                                                                |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_key_mgr_provider.ldif                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/ServerShutdownMonitor.java                                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/shutdown/disable_TLS.ldif               |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif                                             |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif                         |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/README                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif                                                               |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java                                        |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/package-info.java                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1TestCase.java                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java                                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java                                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java                                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif                           |    4 
 opendj-sdk/opends/resource/bin/status.bat                                                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif                                       |    4 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm.ldif                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java                                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java                                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java                                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml                                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml                            |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionException.java                                                                |    2 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/args/BooleanArgument.java                                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/Validator.java                                                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java                                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/SimpleSubtreeSpecification.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_out.ldif                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif                                 |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif                          |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ButtonName.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java                                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif                                                             |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif                                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif                                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java                                                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java                                                    |    2 
 opendj-sdk/opends/resource/bin/statuspanel                                                                                                      |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallException.java                                                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_key_mgr_provider.ldif                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecification.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java                                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif                                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlHandler.java                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_key_mgr_provider.ldif                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/StaticTextTag.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif                                                        |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif              |    4 
 opendj-sdk/opends/resource/uninstall                                                                                                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java         |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/Backend.java                                                                                 |    2 
 opendj-sdk/opends/resource/bin/ldifsearch                                                                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif                                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java                                                          |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ListenerDescriptor.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif                                                   |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml                          |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif                                                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java                                 |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java                                           |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataOptions.java                                                               |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressDescriptor.java                                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java                                                                      |    2 
 opendj-sdk/opends/build-tools/src/windows/README                                                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif                                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/SchemaMessages.java                                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java                                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java                                    |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java                                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java                              |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif                                                              |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeEvent.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogPublisher.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif                                   |    2 
 opendj-sdk/opends/resource/bin/verify-index.bat                                                                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml                                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04                           |    4 
 opendj-sdk/opends/resource/schema/03-rfc2739.ldif                                                                                               |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java                                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif                          |    4 
 opendj-sdk/opends/resource/setup                                                                                                                |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotificationType.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java                                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SyncMessagesTest.java                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12                           |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java                                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif                              |    2 
 opendj-sdk/opends/build-tools/src/org/opends/build/tools/GetSubversionRevision.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/MeteredStream.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/ConfigConstants.java                                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java                                 |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java                                   |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/plugins/package-info.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml                                                               |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java                                               |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateValue.java                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif                                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif                                       |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif                                                      |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java                                       |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java                              |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java                                     |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml                                                |    2 
 opendj-sdk/opends/resource/bin/import-ldif.bat                                                                                                  |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostResponsePluginResultTestCase.java                         |    4 
 opendj-sdk/opends/resource/schema/00-core.ldif                                                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif                                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif                                                                |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseBindOperation.java                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif                              |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif                        |    4 
 opendj-sdk/opends/ext/checkstyle/opends.sourceheader                                                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AlertHandler.java                                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java                                                                        |    2 
 opendj-sdk/opends/resource/bin/ldif-diff                                                                                                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ArrayData.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java                                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java                                    |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java                                                |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundThreadTask.java                                                           |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif                          |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif                                                              |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java                        |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java                                           |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml                                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif                                                  |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/EntryCache.java                                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TagResult.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java                                                              |    2 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java                                                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/InternalConnectionSecurityProviderTestCase.java               |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java                                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/ByteString.java                                                                            |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java                                                         |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallDataException.java                                              |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallData.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_ldaps_conn_handler.ldif  |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif                                                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/LoggerMessages.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif                                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/Control.java                                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif                                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ChangeNotificationListener.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/jks_startup.ldif                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestOutput.java                                             |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java                                                                   |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/ResultCode.java                                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java                                                         |    2 
 opendj-sdk/opends/resource/bin/ldapsearch                                                                                                       |    4 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromLDAP.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java                                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRFC3672SubtreeSpecification.java                                |    4 
 opendj-sdk/opends/resource/bin/ldapsearch.bat                                                                                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java                                                                    |    2 
 opendj-sdk/opends/resource/bin/list-backends.bat                                                                                                |    4 
 opendj-sdk/opends/resource/DynamicConstants.java.stubs                                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/BackendMessages.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/WritabilityMode.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java                                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/backends/backend_start.ldif                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchChangeType.java                                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java                                                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/SequentialTag.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif                                   |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java                                                                 |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif                         |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/InitializationErrorManager.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml                                         |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java                                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/common/LogMessages.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java                                              |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/modrdn/a1_modrdn.ldif                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RDNTag.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd2.ldif                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif                                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif                                       |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/AccessLogger.java                                                                            |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LogFileFilter.java                                                                       |    2 
 opendj-sdk/opends/resource/bin/makeldif.bat                                                                                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/args/MultiChoiceArgument.java                                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/Group.java                                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif                                                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/controls/package-info.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/SchemaConstants.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/BackendInitializationListener.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java                                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestListener.java                                           |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif                                                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDeleteOptions.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java                                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionException.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ObjectClassType.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java                                                     |    2 
 opendj-sdk/opends/resource/bin/start-ds                                                                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif                                              |    4 
 opendj-sdk/opends/resource/bin/ldapcompare.bat                                                                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/package-info.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif                                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java                                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif                                                  |    4 
 opendj-sdk/opends/resource/bin/export-ldif                                                                                                      |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/Access.java                                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PluginType.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java                                                      |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif                         |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java                                   |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java                                                                     |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java                         |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java                                                   |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif                                         |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/package-info.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommand.java                                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif                                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif                                                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessagesTestCase.java                                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java                    |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java                        |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java                                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif                                       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java                                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java                                                               |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif                                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java                                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAddOperation.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java                                                 |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif                                                                  |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java                                                                  |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java                |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java                                                                              |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif                                                               |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java                                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogRecord.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif                                            |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java                             |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java                                                                   |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java                                                |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml                                  |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/StartupPluginResultTestCase.java                              |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java                                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ConfigChangeListener.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/SignatureAction.java                                                                     |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java                                  |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigurableComponentTestCase.java                                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java                                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java                      |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java                                                           |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif                          |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java                                                          |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java                                                  |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java                                    |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java                                             |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateListener.java                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/StartupErrorLogger.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryIDSet.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Constants.java                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java                             |    4 
 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java                                                          |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2CIndexer.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif                                    |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml                                                   |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java                                                                       |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif                     |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java                   |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java                                                                 |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java                                  |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/FilePermission.java                                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogCategory.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java                                                |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif                                           |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif                                             |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResultTestCase.java                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif                                                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationBindOperation.java                                                  |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/LabelFieldDescriptor.java                                                      |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif                                                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2SIndexer.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java                                                                     |    2 
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FileTag.java                                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationType.java                                                                    |    2 
 opendj-sdk/opends/resource/bin/configure-ds                                                                                                     |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif                                                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif                                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/messages/JebMessages.java                                                                        |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java                                          |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif                                                                |    2 
 opendj-sdk/opends/resource/bin/makeldif                                                                                                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/package-info.java                                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif                                                                |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_in.ldif                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java                                                                    |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java                         |    4 
 opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_int.java                                                          |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif                            |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java                                                            |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif                                      |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif                                            |    4 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java                                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java                                                                      |    2 
 opendj-sdk/opends/resource/bin/encode-password.bat                                                                                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/ClientException.java                                                                       |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif                                    |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif                                        |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif                                          |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java                                                             |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java                                     |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java                                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif                                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java                                              |    4 
 opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java                                                               |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif                          |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml                                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java                  |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/Credential.java                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java                                                         |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java                                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/ParentDNTag.java                                                                  |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif                                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java                                                         |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif                                                            |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif                                                               |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java                                                              |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_tls_out.ldif                 |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java                                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EnvManager.java                                                                     |    2 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/util/TimeThread.java                                                                             |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif                           |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java                      |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/api/ConfigHandler.java                                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif                                         |    4 
 opendj-sdk/opends/resource/uninstall.bat                                                                                                        |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif                                                                |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java                      |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java                                                                       |    2 
 opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java                                                |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java                                                                       |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java                                     |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java                                                                            |    2 
 opendj-sdk/opends/tests/installer.xml                                                                                                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/types/DN.java                                                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java                                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/Tracer.java                                                                        |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java                                                                |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif                       |    4 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java                                               |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java                         |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java                                                                |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java                          |    4 
 opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java                                                     |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/UnregisteredMessageIDsTestCase.java                             |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif                                                        |    4 
 opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml                                                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml                                        |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java                                                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ExistingFileBehavior.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java                                                                      |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java                                            |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java                                                                 |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/ServerShutdownListener.java                                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java                                                          |    2 
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationAddOperation.java                                                    |    2 
 opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java                                                    |    2 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif                         |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java                                            |    4 
 opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif                           |    4 
 opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugStackTraceFormatter.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java                                                                           |    2 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif                                                   |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java                                                                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/package-info.java                                                      |    2 
 opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ServerState.java                                                          |    2 
 opendj-sdk/opends/resource/bin/configure-ds.bat                                                                                                 |    4 
 opendj-sdk/opends/resource/schema/03-rfc2714.ldif                                                                                               |    4 
 opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml                                                  |    2 
 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java                                                             |    2 
 opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/package-info.java                                                               |    2 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java                                            |    4 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java                                    |    4 
 opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java                                                              |    2 
 opendj-sdk/opends/src/server/org/opends/server/loggers/LogErrorHandler.java                                                                     |    2 
 1,943 files changed, 2,641 insertions(+), 2,641 deletions(-)

diff --git a/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadService.java b/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadService.java
index d142ee6..5a6ed35 100644
--- a/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadService.java
+++ b/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadService.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package javax.jnlp;
diff --git a/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadServiceListener.java b/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadServiceListener.java
index aed1c12..80bca75 100644
--- a/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadServiceListener.java
+++ b/opendj-sdk/opends/build-tools/src/javax/jnlp/DownloadServiceListener.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package javax.jnlp;
diff --git a/opendj-sdk/opends/build-tools/src/javax/jnlp/ServiceManager.java b/opendj-sdk/opends/build-tools/src/javax/jnlp/ServiceManager.java
index 0d57b6d..a3adf2d 100644
--- a/opendj-sdk/opends/build-tools/src/javax/jnlp/ServiceManager.java
+++ b/opendj-sdk/opends/build-tools/src/javax/jnlp/ServiceManager.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package javax.jnlp;
diff --git a/opendj-sdk/opends/build-tools/src/javax/jnlp/UnavailableServiceException.java b/opendj-sdk/opends/build-tools/src/javax/jnlp/UnavailableServiceException.java
index 54f6e10..92f2383 100644
--- a/opendj-sdk/opends/build-tools/src/javax/jnlp/UnavailableServiceException.java
+++ b/opendj-sdk/opends/build-tools/src/javax/jnlp/UnavailableServiceException.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package javax.jnlp;
diff --git a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckCopyrightDates.java b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckCopyrightDates.java
index ed77785..b8ca8f8 100644
--- a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckCopyrightDates.java
+++ b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckCopyrightDates.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckEOLStyle.java b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckEOLStyle.java
index 5343b38..30645a5 100644
--- a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckEOLStyle.java
+++ b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CheckEOLStyle.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CoverageDiff.java b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CoverageDiff.java
index 4790385..d20f004 100644
--- a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CoverageDiff.java
+++ b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/CoverageDiff.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/GetSubversionRevision.java b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/GetSubversionRevision.java
index 2133080..1614c8b 100644
--- a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/GetSubversionRevision.java
+++ b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/GetSubversionRevision.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/PrepTestNG.java b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/PrepTestNG.java
index 27d43ed..71804c6 100644
--- a/opendj-sdk/opends/build-tools/src/org/opends/build/tools/PrepTestNG.java
+++ b/opendj-sdk/opends/build-tools/src/org/opends/build/tools/PrepTestNG.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.build.tools;
diff --git a/opendj-sdk/opends/build-tools/src/windows/README b/opendj-sdk/opends/build-tools/src/windows/README
index 900386c..65c76c3 100644
--- a/opendj-sdk/opends/build-tools/src/windows/README
+++ b/opendj-sdk/opends/build-tools/src/windows/README
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build-tools/src/windows/winlauncher.c b/opendj-sdk/opends/build-tools/src/windows/winlauncher.c
index 6823937..fd6464b 100644
--- a/opendj-sdk/opends/build-tools/src/windows/winlauncher.c
+++ b/opendj-sdk/opends/build-tools/src/windows/winlauncher.c
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build-tools/src/windows/winlauncher.h b/opendj-sdk/opends/build-tools/src/windows/winlauncher.h
index 3de5385..273ced3 100644
--- a/opendj-sdk/opends/build-tools/src/windows/winlauncher.h
+++ b/opendj-sdk/opends/build-tools/src/windows/winlauncher.h
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index fffa8e2..13a470a 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -16,7 +16,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/ext/checkstyle/opends.sourceheader b/opendj-sdk/opends/ext/checkstyle/opends.sourceheader
index e96ef0d..73a7239 100644
--- a/opendj-sdk/opends/ext/checkstyle/opends.sourceheader
+++ b/opendj-sdk/opends/ext/checkstyle/opends.sourceheader
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/DynamicConstants.java.stubs b/opendj-sdk/opends/resource/DynamicConstants.java.stubs
index 5c19014..7d29305 100644
--- a/opendj-sdk/opends/resource/DynamicConstants.java.stubs
+++ b/opendj-sdk/opends/resource/DynamicConstants.java.stubs
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/FindJavaHome.java b/opendj-sdk/opends/resource/FindJavaHome.java
index 658acb3..604a866 100644
--- a/opendj-sdk/opends/resource/FindJavaHome.java
+++ b/opendj-sdk/opends/resource/FindJavaHome.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 import java.io.*;
 
diff --git a/opendj-sdk/opends/resource/bin/_client-script.bat b/opendj-sdk/opends/resource/bin/_client-script.bat
index 9ac82e1..5f79e87 100644
--- a/opendj-sdk/opends/resource/bin/_client-script.bat
+++ b/opendj-sdk/opends/resource/bin/_client-script.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 rem This script is used to invoke various server-side processes.  It should not
 rem be invoked directly by end users.
diff --git a/opendj-sdk/opends/resource/bin/_client-script.sh b/opendj-sdk/opends/resource/bin/_client-script.sh
index 2d95471..1f18797 100755
--- a/opendj-sdk/opends/resource/bin/_client-script.sh
+++ b/opendj-sdk/opends/resource/bin/_client-script.sh
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script is used to invoke various client-side processes.  It should not
diff --git a/opendj-sdk/opends/resource/bin/_server-script.bat b/opendj-sdk/opends/resource/bin/_server-script.bat
index 7905601..8cfc11c 100644
--- a/opendj-sdk/opends/resource/bin/_server-script.bat
+++ b/opendj-sdk/opends/resource/bin/_server-script.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 rem This script is used to invoke various server-side processes.  It should not
 rem be invoked directly by end users.
diff --git a/opendj-sdk/opends/resource/bin/_server-script.sh b/opendj-sdk/opends/resource/bin/_server-script.sh
index 8c42d8e..141ac2e 100755
--- a/opendj-sdk/opends/resource/bin/_server-script.sh
+++ b/opendj-sdk/opends/resource/bin/_server-script.sh
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script is used to invoke various server-side processes.  It should not
diff --git a/opendj-sdk/opends/resource/bin/backup b/opendj-sdk/opends/resource/bin/backup
index bd2b09e..864933d 100755
--- a/opendj-sdk/opends/resource/bin/backup
+++ b/opendj-sdk/opends/resource/bin/backup
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform a backup of a Directory Server backend.
diff --git a/opendj-sdk/opends/resource/bin/backup.bat b/opendj-sdk/opends/resource/bin/backup.bat
index e1f3165..17ec2d4 100644
--- a/opendj-sdk/opends/resource/bin/backup.bat
+++ b/opendj-sdk/opends/resource/bin/backup.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/configure-ds b/opendj-sdk/opends/resource/bin/configure-ds
index 1a7e22a..11c2e06 100755
--- a/opendj-sdk/opends/resource/bin/configure-ds
+++ b/opendj-sdk/opends/resource/bin/configure-ds
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to configure an existing Directory Server
diff --git a/opendj-sdk/opends/resource/bin/configure-ds.bat b/opendj-sdk/opends/resource/bin/configure-ds.bat
index 6742792..298dfbc 100644
--- a/opendj-sdk/opends/resource/bin/configure-ds.bat
+++ b/opendj-sdk/opends/resource/bin/configure-ds.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/encode-password b/opendj-sdk/opends/resource/bin/encode-password
index d68144c..23ae5c9 100755
--- a/opendj-sdk/opends/resource/bin/encode-password
+++ b/opendj-sdk/opends/resource/bin/encode-password
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to encode clear-text passwords or verify whether a
diff --git a/opendj-sdk/opends/resource/bin/encode-password.bat b/opendj-sdk/opends/resource/bin/encode-password.bat
index 4daca2c..3df4f0a 100644
--- a/opendj-sdk/opends/resource/bin/encode-password.bat
+++ b/opendj-sdk/opends/resource/bin/encode-password.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/export-ldif b/opendj-sdk/opends/resource/bin/export-ldif
index e1b4d7e..19885ec 100755
--- a/opendj-sdk/opends/resource/bin/export-ldif
+++ b/opendj-sdk/opends/resource/bin/export-ldif
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform an LDIF export for a Directory Server
diff --git a/opendj-sdk/opends/resource/bin/export-ldif.bat b/opendj-sdk/opends/resource/bin/export-ldif.bat
index 4a6112d..c8964e2 100644
--- a/opendj-sdk/opends/resource/bin/export-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/export-ldif.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/import-ldif b/opendj-sdk/opends/resource/bin/import-ldif
index 0ebe3e8..5f72f8c 100755
--- a/opendj-sdk/opends/resource/bin/import-ldif
+++ b/opendj-sdk/opends/resource/bin/import-ldif
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to import LDIF data into a Directory Server backend.
diff --git a/opendj-sdk/opends/resource/bin/import-ldif.bat b/opendj-sdk/opends/resource/bin/import-ldif.bat
index 64205a8..cddbc11 100644
--- a/opendj-sdk/opends/resource/bin/import-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/import-ldif.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldapcompare b/opendj-sdk/opends/resource/bin/ldapcompare
index 5bbe8b0..9b3f7af 100755
--- a/opendj-sdk/opends/resource/bin/ldapcompare
+++ b/opendj-sdk/opends/resource/bin/ldapcompare
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform LDAP compare operations.
diff --git a/opendj-sdk/opends/resource/bin/ldapcompare.bat b/opendj-sdk/opends/resource/bin/ldapcompare.bat
index 36d9422..27e165a 100644
--- a/opendj-sdk/opends/resource/bin/ldapcompare.bat
+++ b/opendj-sdk/opends/resource/bin/ldapcompare.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldapdelete b/opendj-sdk/opends/resource/bin/ldapdelete
index a67ecf9..d909dab 100755
--- a/opendj-sdk/opends/resource/bin/ldapdelete
+++ b/opendj-sdk/opends/resource/bin/ldapdelete
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform LDAP delete operations.
diff --git a/opendj-sdk/opends/resource/bin/ldapdelete.bat b/opendj-sdk/opends/resource/bin/ldapdelete.bat
index 1eed132..e58fc58 100644
--- a/opendj-sdk/opends/resource/bin/ldapdelete.bat
+++ b/opendj-sdk/opends/resource/bin/ldapdelete.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldapmodify b/opendj-sdk/opends/resource/bin/ldapmodify
index d111d97..f854831 100755
--- a/opendj-sdk/opends/resource/bin/ldapmodify
+++ b/opendj-sdk/opends/resource/bin/ldapmodify
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform LDAP add, delete, modify, and modify DN
diff --git a/opendj-sdk/opends/resource/bin/ldapmodify.bat b/opendj-sdk/opends/resource/bin/ldapmodify.bat
index f39fdff..303a29c 100644
--- a/opendj-sdk/opends/resource/bin/ldapmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldapmodify.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldappasswordmodify b/opendj-sdk/opends/resource/bin/ldappasswordmodify
index a42035c..bed7716 100755
--- a/opendj-sdk/opends/resource/bin/ldappasswordmodify
+++ b/opendj-sdk/opends/resource/bin/ldappasswordmodify
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform LDAP password modify operations.
diff --git a/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat b/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
index 1b8834f..3c166ec 100644
--- a/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldapsearch b/opendj-sdk/opends/resource/bin/ldapsearch
index 8b1ef76..e18decb 100755
--- a/opendj-sdk/opends/resource/bin/ldapsearch
+++ b/opendj-sdk/opends/resource/bin/ldapsearch
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform LDAP search operations.
diff --git a/opendj-sdk/opends/resource/bin/ldapsearch.bat b/opendj-sdk/opends/resource/bin/ldapsearch.bat
index 23f5513..a9f119d 100644
--- a/opendj-sdk/opends/resource/bin/ldapsearch.bat
+++ b/opendj-sdk/opends/resource/bin/ldapsearch.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldif-diff b/opendj-sdk/opends/resource/bin/ldif-diff
index 69802dd..7e2f65a 100755
--- a/opendj-sdk/opends/resource/bin/ldif-diff
+++ b/opendj-sdk/opends/resource/bin/ldif-diff
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to compare the contents of two LDIF files.
diff --git a/opendj-sdk/opends/resource/bin/ldif-diff.bat b/opendj-sdk/opends/resource/bin/ldif-diff.bat
index 7ff331e..1983d37 100644
--- a/opendj-sdk/opends/resource/bin/ldif-diff.bat
+++ b/opendj-sdk/opends/resource/bin/ldif-diff.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldifmodify b/opendj-sdk/opends/resource/bin/ldifmodify
index 36b650d..59a8fed 100755
--- a/opendj-sdk/opends/resource/bin/ldifmodify
+++ b/opendj-sdk/opends/resource/bin/ldifmodify
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to alter the contents of an LDIF file.
diff --git a/opendj-sdk/opends/resource/bin/ldifmodify.bat b/opendj-sdk/opends/resource/bin/ldifmodify.bat
index cccb864..dc09ff2 100644
--- a/opendj-sdk/opends/resource/bin/ldifmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldifmodify.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/ldifsearch b/opendj-sdk/opends/resource/bin/ldifsearch
index a69c152..2af9a76 100755
--- a/opendj-sdk/opends/resource/bin/ldifsearch
+++ b/opendj-sdk/opends/resource/bin/ldifsearch
@@ -17,7 +17,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/ldifsearch.bat b/opendj-sdk/opends/resource/bin/ldifsearch.bat
index 4d72b2b..67ae30a 100644
--- a/opendj-sdk/opends/resource/bin/ldifsearch.bat
+++ b/opendj-sdk/opends/resource/bin/ldifsearch.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/list-backends b/opendj-sdk/opends/resource/bin/list-backends
index cb42924..f640c90 100755
--- a/opendj-sdk/opends/resource/bin/list-backends
+++ b/opendj-sdk/opends/resource/bin/list-backends
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform a restore of a Directory Server backend.
diff --git a/opendj-sdk/opends/resource/bin/list-backends.bat b/opendj-sdk/opends/resource/bin/list-backends.bat
index 82986c4..1650694 100644
--- a/opendj-sdk/opends/resource/bin/list-backends.bat
+++ b/opendj-sdk/opends/resource/bin/list-backends.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/makeldif b/opendj-sdk/opends/resource/bin/makeldif
index 28bc1c9..10c4d31 100755
--- a/opendj-sdk/opends/resource/bin/makeldif
+++ b/opendj-sdk/opends/resource/bin/makeldif
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to generate LDIF data based on a provided template.
diff --git a/opendj-sdk/opends/resource/bin/makeldif.bat b/opendj-sdk/opends/resource/bin/makeldif.bat
index 0957dee..752b056 100644
--- a/opendj-sdk/opends/resource/bin/makeldif.bat
+++ b/opendj-sdk/opends/resource/bin/makeldif.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/restore b/opendj-sdk/opends/resource/bin/restore
index 426d9d0..298521d 100755
--- a/opendj-sdk/opends/resource/bin/restore
+++ b/opendj-sdk/opends/resource/bin/restore
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform a restore of a Directory Server backend.
diff --git a/opendj-sdk/opends/resource/bin/restore.bat b/opendj-sdk/opends/resource/bin/restore.bat
index 320c9a2..d146c47 100644
--- a/opendj-sdk/opends/resource/bin/restore.bat
+++ b/opendj-sdk/opends/resource/bin/restore.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/bin/setcp.bat b/opendj-sdk/opends/resource/bin/setcp.bat
index 72af981..98d0ec2 100644
--- a/opendj-sdk/opends/resource/bin/setcp.bat
+++ b/opendj-sdk/opends/resource/bin/setcp.bat
@@ -16,13 +16,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 set CLASSPATHCOMPONENT=%1
 if ""%1""=="""" goto gotAllArgs
diff --git a/opendj-sdk/opends/resource/bin/start-ds b/opendj-sdk/opends/resource/bin/start-ds
index 0a4578d..1d21ce9 100755
--- a/opendj-sdk/opends/resource/bin/start-ds
+++ b/opendj-sdk/opends/resource/bin/start-ds
@@ -17,7 +17,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat
index f943ead..effbb06 100644
--- a/opendj-sdk/opends/resource/bin/start-ds.bat
+++ b/opendj-sdk/opends/resource/bin/start-ds.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/status b/opendj-sdk/opends/resource/bin/status
index 656e7dd..01c51e8 100644
--- a/opendj-sdk/opends/resource/bin/status
+++ b/opendj-sdk/opends/resource/bin/status
@@ -17,7 +17,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/status.bat b/opendj-sdk/opends/resource/bin/status.bat
index bba6b46..49dee20 100644
--- a/opendj-sdk/opends/resource/bin/status.bat
+++ b/opendj-sdk/opends/resource/bin/status.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/statuspanel b/opendj-sdk/opends/resource/bin/statuspanel
index 75fc10e..d469283 100644
--- a/opendj-sdk/opends/resource/bin/statuspanel
+++ b/opendj-sdk/opends/resource/bin/statuspanel
@@ -17,7 +17,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/statuspanel.bat b/opendj-sdk/opends/resource/bin/statuspanel.bat
index 61134c9..5c3284c 100644
--- a/opendj-sdk/opends/resource/bin/statuspanel.bat
+++ b/opendj-sdk/opends/resource/bin/statuspanel.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/stop-ds b/opendj-sdk/opends/resource/bin/stop-ds
index b343b0c..9969147 100755
--- a/opendj-sdk/opends/resource/bin/stop-ds
+++ b/opendj-sdk/opends/resource/bin/stop-ds
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to request that the Directory Server shut down.
diff --git a/opendj-sdk/opends/resource/bin/stop-ds.bat b/opendj-sdk/opends/resource/bin/stop-ds.bat
index fb456e0..fc9fe8c 100644
--- a/opendj-sdk/opends/resource/bin/stop-ds.bat
+++ b/opendj-sdk/opends/resource/bin/stop-ds.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/bin/verify-index b/opendj-sdk/opends/resource/bin/verify-index
index ad3a68f..209cc2a 100755
--- a/opendj-sdk/opends/resource/bin/verify-index
+++ b/opendj-sdk/opends/resource/bin/verify-index
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # This script may be used to perform validation on the contents of a Directory
diff --git a/opendj-sdk/opends/resource/bin/verify-index.bat b/opendj-sdk/opends/resource/bin/verify-index.bat
index 35ef2e2..0fc4cb7 100644
--- a/opendj-sdk/opends/resource/bin/verify-index.bat
+++ b/opendj-sdk/opends/resource/bin/verify-index.bat
@@ -17,13 +17,13 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
 rem
 rem
-rem      Portions Copyright 2006 Sun Microsystems, Inc.
+rem      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 setlocal
 
diff --git a/opendj-sdk/opends/resource/config/config.ldif b/opendj-sdk/opends/resource/config/config.ldif
index 58f472b..6b2b2ea 100644
--- a/opendj-sdk/opends/resource/config/config.ldif
+++ b/opendj-sdk/opends/resource/config/config.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/schema/00-core.ldif b/opendj-sdk/opends/resource/schema/00-core.ldif
index 599c89f..5e877b7 100644
--- a/opendj-sdk/opends/resource/schema/00-core.ldif
+++ b/opendj-sdk/opends/resource/schema/00-core.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/schema/01-pwpolicy.ldif b/opendj-sdk/opends/resource/schema/01-pwpolicy.ldif
index a989476..b17ce39 100644
--- a/opendj-sdk/opends/resource/schema/01-pwpolicy.ldif
+++ b/opendj-sdk/opends/resource/schema/01-pwpolicy.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from draft-behera-ldap-password-policy,
diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index 98110f6..4d0a77e 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/schema/03-changelog.ldif b/opendj-sdk/opends/resource/schema/03-changelog.ldif
index d1bf03d..29d1c6c 100644
--- a/opendj-sdk/opends/resource/schema/03-changelog.ldif
+++ b/opendj-sdk/opends/resource/schema/03-changelog.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from draft-good-ldap-changelog, which
diff --git a/opendj-sdk/opends/resource/schema/03-rfc2713.ldif b/opendj-sdk/opends/resource/schema/03-rfc2713.ldif
index 641efdc..e0aed2f 100644
--- a/opendj-sdk/opends/resource/schema/03-rfc2713.ldif
+++ b/opendj-sdk/opends/resource/schema/03-rfc2713.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 2713, which defines a
diff --git a/opendj-sdk/opends/resource/schema/03-rfc2714.ldif b/opendj-sdk/opends/resource/schema/03-rfc2714.ldif
index fbb5b8d..d904cdd 100644
--- a/opendj-sdk/opends/resource/schema/03-rfc2714.ldif
+++ b/opendj-sdk/opends/resource/schema/03-rfc2714.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 2714, which defines a
diff --git a/opendj-sdk/opends/resource/schema/03-rfc2739.ldif b/opendj-sdk/opends/resource/schema/03-rfc2739.ldif
index e1c2102..e80588d 100644
--- a/opendj-sdk/opends/resource/schema/03-rfc2739.ldif
+++ b/opendj-sdk/opends/resource/schema/03-rfc2739.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 2739, which defines a
diff --git a/opendj-sdk/opends/resource/schema/03-rfc2926.ldif b/opendj-sdk/opends/resource/schema/03-rfc2926.ldif
index 684f89d..5ad5f9c 100644
--- a/opendj-sdk/opends/resource/schema/03-rfc2926.ldif
+++ b/opendj-sdk/opends/resource/schema/03-rfc2926.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 2926, which defines a
diff --git a/opendj-sdk/opends/resource/schema/03-rfc3112.ldif b/opendj-sdk/opends/resource/schema/03-rfc3112.ldif
index 4f8cd6e..4f7849a 100644
--- a/opendj-sdk/opends/resource/schema/03-rfc3112.ldif
+++ b/opendj-sdk/opends/resource/schema/03-rfc3112.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 3112, which defines the
diff --git a/opendj-sdk/opends/resource/schema/03-rfc3712.ldif b/opendj-sdk/opends/resource/schema/03-rfc3712.ldif
index ce098c6..10e265f 100644
--- a/opendj-sdk/opends/resource/schema/03-rfc3712.ldif
+++ b/opendj-sdk/opends/resource/schema/03-rfc3712.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 3712, which defines a
diff --git a/opendj-sdk/opends/resource/schema/03-uddiv3.ldif b/opendj-sdk/opends/resource/schema/03-uddiv3.ldif
index 3e178db..70e9207 100644
--- a/opendj-sdk/opends/resource/schema/03-uddiv3.ldif
+++ b/opendj-sdk/opends/resource/schema/03-uddiv3.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from RFC 4403,
diff --git a/opendj-sdk/opends/resource/schema/04-rfc2307bis.ldif b/opendj-sdk/opends/resource/schema/04-rfc2307bis.ldif
index 7d2066e..71b29ae 100644
--- a/opendj-sdk/opends/resource/schema/04-rfc2307bis.ldif
+++ b/opendj-sdk/opends/resource/schema/04-rfc2307bis.ldif
@@ -15,13 +15,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # This file contains schema definitions from the draft-howard-rfc2307bis
diff --git a/opendj-sdk/opends/resource/setup b/opendj-sdk/opends/resource/setup
index bb4e26a..e2c0703 100755
--- a/opendj-sdk/opends/resource/setup
+++ b/opendj-sdk/opends/resource/setup
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # See if JAVA_HOME is set.  If not, then see if there is a java executable in
diff --git a/opendj-sdk/opends/resource/setup.bat b/opendj-sdk/opends/resource/setup.bat
index b751920..b3f46cf 100644
--- a/opendj-sdk/opends/resource/setup.bat
+++ b/opendj-sdk/opends/resource/setup.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/resource/uninstall b/opendj-sdk/opends/resource/uninstall
index 687f1b7..014d0e8 100644
--- a/opendj-sdk/opends/resource/uninstall
+++ b/opendj-sdk/opends/resource/uninstall
@@ -17,13 +17,13 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 
 
 # See if JAVA_HOME is set.  If not, then see if there is a java executable in
diff --git a/opendj-sdk/opends/resource/uninstall.bat b/opendj-sdk/opends/resource/uninstall.bat
index 4613361..a8e457f 100644
--- a/opendj-sdk/opends/resource/uninstall.bat
+++ b/opendj-sdk/opends/resource/uninstall.bat
@@ -17,7 +17,7 @@
 rem file and include the License file at
 rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 rem add the following below this CDDL HEADER, with the fields enclosed
-rem by brackets "[]" replaced with your own identifying * information:
+rem by brackets "[]" replaced with your own identifying information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
 rem CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
index b626451..39c9983 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
index ceed4d7..b608b03 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
index c47aa81..5e9ae16 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
index baf3dba..3766492 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
index 99afe88..48217ad 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
index 1068be7..fa61ecb 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java
index 1f25446..5084091 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyOperation.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.dsml.protocol;
 
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index b3e56bb..a8c344d 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 58f1f02..c180411 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/NamespacePrefixMapperImpl.java b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/NamespacePrefixMapperImpl.java
index 185678e..0296243 100644
--- a/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/NamespacePrefixMapperImpl.java
+++ b/opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/NamespacePrefixMapperImpl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ButtonName.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ButtonName.java
index 515682b..e11df2e 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ButtonName.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ButtonName.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
index 9b39593..09daf56 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
index 6019e72..9f7a9ed 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/SplashScreen.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/SplashScreen.java
index 7e4acd8..47e7a3f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/SplashScreen.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/SplashScreen.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java
index 9432889..05e6e27 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java
index 0d38480..67c3412 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java
index 19264e7..c879be9 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java
index 03bebc6..ef5af0a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateEvent.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateEvent.java
index f6fee3a..8bc0f32 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateEvent.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateEvent.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateListener.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateListener.java
index 3edf80a..c255090 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateListener.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java
index d690a39..c7d7c18 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateEvent.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateEvent.java
index e29bad3..83df122 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateEvent.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateEvent.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateListener.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateListener.java
index 85c9703..39a41ee 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateListener.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/i18n/ResourceProvider.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/i18n/ResourceProvider.java
index fbcec94..a7b6201 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/i18n/ResourceProvider.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/i18n/ResourceProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataOptions.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataOptions.java
index 25be74c..c907e15 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataOptions.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/FieldName.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/FieldName.java
index 0a6b346..937721e 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/FieldName.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/FieldName.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallException.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallException.java
index 705e013..cd9889f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallException.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
index 4cd4ecc..5a283ee 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressDescriptor.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressDescriptor.java
index 221c6df..9389874 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressDescriptor.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressDescriptor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java
index 9c3db54..05ade2c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 3ecf739..c564963 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index f602065..a81f378 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/LabelFieldDescriptor.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/LabelFieldDescriptor.java
index 404cf15..4b9a12a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/LabelFieldDescriptor.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/LabelFieldDescriptor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallData.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallData.java
index dc6fa13..e07d675 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallData.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallData.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallDataException.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallDataException.java
index 7c759b2..96d4a51 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallDataException.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallDataException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
index e274335..3e0b3f5 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/JnlpProperties.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/JnlpProperties.java
index 86a3df7..cc74756 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/JnlpProperties.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/JnlpProperties.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartDownloader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartDownloader.java
index 3549b4b..975028d 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartDownloader.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartDownloader.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index c1e21f5..8f16bb6 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index e2cbae8..867c573 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
index fdd3156..5f16a82 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ConfirmUninstallPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ConfirmUninstallPanel.java
index 006eaff..7245fd9 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ConfirmUninstallPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ConfirmUninstallPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
index a113b23..4ef7186 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
index e332c5e..84defad 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java
index f664bbc..77cc909 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java
index fd53d63..dfb302f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java
index 5de79ac..9175bcb 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/FramePanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java
index 029c343..33e09c8 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
index c8317e6..8c2ec72 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
index c8c0a57..b2c7b3d 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
index 1070511..2147985 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java
index 06fb072..89810c1 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
index ea91d6b..63854bd 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
index abccf8d..fcf78cd 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java
index bf00a43..517b073 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java
index e9bf9c9..40e274f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
index b44f253..c4cad53 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
index edc34d2..2336d80 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
index fbda70c..7525fd2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCli.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallException.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallException.java
index 37082c3..ea72225 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallException.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
index 9f5595e..15a5d40 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressDescriptor.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressDescriptor.java
index ae6eef5..e8eeeae 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressDescriptor.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressDescriptor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressStep.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressStep.java
index b63b28e..0fc2ee7 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressStep.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressStep.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
index eb45df9..4b8f2fa 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallData.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallData.java
index 752dd23..be80151 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallData.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallData.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallDataException.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallDataException.java
index 36b884c..c9374f2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallDataException.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallDataException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java
index 5572b88..8a82ac6 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundThreadTask.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundThreadTask.java
index 2b5f682..3ba772b 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundThreadTask.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundThreadTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java
index 8c39a40..5760c43 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
index 6e64650..89c021e 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
index 0f9ea35..3fac5ae 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java
index b1faf70..72adb05 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/URLWorker.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/URLWorker.java
index 21c59ee..da4fc4c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/URLWorker.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/URLWorker.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
index e722310..b442baa 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java
index ba5ab1b..0cb620a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java
index 98f85aa..73e14e7 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlHandler.java
index 19a9d0b..fccc56c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlProvider.java
index 0088657..81b51c2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AccessControlProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogger.java b/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogger.java
index b8c97b2..6f0255e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AccessLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
index c2012e8..5bf5a62 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AlertGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/api/AlertGenerator.java
index 8c74bec..9e395da 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AlertGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AlertGenerator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AlertHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/AlertHandler.java
index 9f59474..4f29363 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AlertHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AlertHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java
index efb2e14..86e3d2f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
index 1906fff..413470a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeValueDecoder.java b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeValueDecoder.java
index c3aa6bd..0e4b503 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/AttributeValueDecoder.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/AttributeValueDecoder.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java b/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
index f658492..2cda421 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/Backend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/BackendInitializationListener.java b/opendj-sdk/opends/src/server/org/opends/server/api/BackendInitializationListener.java
index 740b63d..264b2ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/BackendInitializationListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/BackendInitializationListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java
index dedfb6b..47aaaf9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ChangeNotificationListener.java b/opendj-sdk/opends/src/server/org/opends/server/api/ChangeNotificationListener.java
index 554e043..2e99287 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ChangeNotificationListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ChangeNotificationListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
index 3aa32a7..e08930e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigAddListener.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigAddListener.java
index 31cdf29..4a86d65 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigAddListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigAddListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigChangeListener.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigChangeListener.java
index e127d19..b303281 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigChangeListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigChangeListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigDeleteListener.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigDeleteListener.java
index c2b05b5..335f994 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigDeleteListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigDeleteListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigHandler.java
index c9afe1b..5d5f00e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigurableComponent.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigurableComponent.java
index 62a6751..fd60535 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConfigurableComponent.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConfigurableComponent.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java
index 00c6f7c..e173d0c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionSecurityProvider.java
index ac37e9e..dd0e042 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ConnectionSecurityProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryServerMBean.java b/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryServerMBean.java
index 1cc96d1..a24a2b5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryServerMBean.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryServerMBean.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java b/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java
index e4f93cc..d2a85fc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/EntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/api/EntryCache.java
index 5fc3c61..420b724 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/EntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/EntryCache.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java
index 1489f99..9825960 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ErrorLogger.java b/opendj-sdk/opends/src/server/org/opends/server/api/ErrorLogger.java
index 4bca1e3..4781f2f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ErrorLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ErrorLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java
index eefc573..483c0ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/Group.java b/opendj-sdk/opends/src/server/org/opends/server/api/Group.java
index 5caaa16..389d067 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/Group.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/Group.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java b/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java
index 141d8eb..97e6571 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/InvokableComponent.java b/opendj-sdk/opends/src/server/org/opends/server/api/InvokableComponent.java
index 8346785..5e14539 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/InvokableComponent.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/InvokableComponent.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/KeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/KeyManagerProvider.java
index cbeadbf..8e84dec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/KeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/KeyManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/LogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/api/LogPublisher.java
index 35bfc27..861c534 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/LogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/LogPublisher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java
index 8ce6710..098e45c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java
index 2b54ef9..77a388f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
index 3fa73a9..531b0dc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java
index a019b2d..e568f7f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
index 7409fb8..2e9cc3a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java
index efb10f7..f830e73 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ProtocolElement.java b/opendj-sdk/opends/src/server/org/opends/server/api/ProtocolElement.java
index ddcd1ca..c23adb8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ProtocolElement.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ProtocolElement.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java
index c50206f..a58364c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/ServerShutdownListener.java b/opendj-sdk/opends/src/server/org/opends/server/api/ServerShutdownListener.java
index da6d584..9495283 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/ServerShutdownListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/ServerShutdownListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java
index 86f797d..c58c2f4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecification.java b/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecification.java
index a1228ed..0679061 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecificationSet.java b/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecificationSet.java
index dc49ed0..cd78429 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecificationSet.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecificationSet.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
index 07c2af5..558f03a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/TrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/api/TrustManagerProvider.java
index 35bac44..eab823a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/TrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/TrustManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttribute.java
index a65619e..5104aec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java b/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java
index e78bca5..14b9731 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/api/package-info.java
index f62833e..a277357 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
index 82495b6..ad872f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java
index a201f3e..019c92e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java
index 0f47b2f..2f127f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PluginType.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PluginType.java
index 1ab751b..ccf61c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PluginType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PluginType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java
index 6c3e0c7..26f49a2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java
index 3ba3fe5..f97d3d3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java
index 412de1b..2ab966f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java
index 8b75c6a..91f0bec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java
index 46fc862..3ef2dcd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java
index dfb8975..8edb1bf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java
index 278cbed..4d52a48 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java
index 20e303a..8f3dda7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java
index 27cb109..ed69938 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/package-info.java
index 1b0642b..9511e93 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/api/plugin/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/api/plugin/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlHandler.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlHandler.java
index 0b637bd..4e4c71a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlProvider.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlProvider.java
index 491dc45..8382e44 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
index 9edddc5..e7c7f22 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java
index 80e63cc..dd0c1e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
index d87372f..0a32315 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
index 0e2bd70..8f50949 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciEvalContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciException.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciException.java
index 753af2f..49e4e5e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 990c3dd..d91155b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java
index 58d43f4..126eeb0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciLDAPOperationContainer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 3a85b35..62f81e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 14338d8..6155953 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
index 1dd5539..db9aa81 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciProvider.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciProvider.java
index c44d607..105f224 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
index 2276a50..833309d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
index 8352955..f21ac6e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
index 2027bed..9c58c50 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java
index d9e7888..5d6a79e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java
index ea403b4..ba97b91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
index c5c732c..f2af1ee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java
index f486bb1..3a20a35 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAccessType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
index 740667e..1f12a12 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumAuthMethod.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java
index 84fa1f3..cfea957 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleKeyword.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java
index ba2421e..3e0a91d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBindRuleType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java
index c2fa963..cd81820 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumBooleanTypes.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java
index 1d183b0..bd00a8d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumDayOfWeek.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java
index a3a9d22..b63581e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumEvalResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumRight.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumRight.java
index 335124e..11a4e4a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumRight.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumRight.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java
index 0368d5d..9ef3b00 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetKeyword.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java
index 195208c..72f22e7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumTargetOperator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java
index 240c969..9e943c3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/EnumUserDNType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
index 2145e77..78aac73 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
index f1c76e1..a3eb8ed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java
index 6e05740..a81048b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java
index 38e15a7..e50bdd4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java
index c9205f8..f9b9e5f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/KeywordBindRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
index abb6ed9..17e341d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java
index 41474a6..c64976f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PermBindRulePair.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java
index 5f340ba..2e013c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java
index a32f27e..a3ec83e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
index 2efc454..cba42bc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java
index d3d755b..fa02d7b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
index 6cb7db8..e4f23dc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
index 14cf8a4..743d85c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
index f96f484..c42c193 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
index 7d409e7..2f65e25 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
index 49da707..2154c3c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java
index 11ea4c7..9cedaab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDNTypeURL.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/package-info.java
index b65de78..ec21d80 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
index 58abefe..a1d7319 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
index bf94ed2..a278676 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
index a87684d..c18e149 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
index 356a738..d0a1695 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
index 4b6a760..0a17321 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 95faae1..1cadf3d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 1e34280..3d4a8f0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index 22613b1..d833aac 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BufferedIndex.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BufferedIndex.java
index 24943a3..713e161 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BufferedIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BufferedIndex.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Config.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Config.java
index c6e3f32..6f22ebe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Config.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Config.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index ad6b8be..a08561f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java
index ff11eff..09dce48 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
index b7caaa2..684a748 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DataConfig.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DataConfig.java
index 71ac926..268b337 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DataConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DataConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java
index 7cb6aa1..44d8cb6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 6d72cd9..0343827 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryID.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryID.java
index 1e9f8cc..5ba64dc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryID.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryID.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryIDSet.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryIDSet.java
index e654b37..f843c69 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryIDSet.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryIDSet.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EnvManager.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EnvManager.java
index 559828a..dfc4ae5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EnvManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EnvManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
index 4620912..7bd4667 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
index 567f3b9..bfdc8c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2CIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2CIndexer.java
index a290e0f..01b5773 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2CIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2CIndexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2Entry.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2Entry.java
index 9ffb6f7..5f2559d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2Entry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2Entry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2SIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2SIndexer.java
index 1aeef69..5b3edbe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2SIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2SIndexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IDSetIterator.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IDSetIterator.java
index 0025ebb..f976fbd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IDSetIterator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IDSetIterator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportContext.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportContext.java
index fcafc38..9550977 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index cd3cd5a..8274945 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportThread.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportThread.java
index de966ba..2063415 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
index 3b4454b..7727d96 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexBuilder.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexBuilder.java
index 8c2af6e..33b596e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexBuilder.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexBuilder.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexConfig.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexConfig.java
index 8489e35..9e465f1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexFilter.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexFilter.java
index 380e02f..3646565 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorAllIds.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorAllIds.java
index e9c2449..35fe402 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorAllIds.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorAllIds.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorRange.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorRange.java
index 8db3a45..71a4b8e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorRange.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorRange.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
index f1a016f..a0909d3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMod.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMod.java
index 7a715fa..d507494 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMod.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMod.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexModComparator.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexModComparator.java
index c1ce029..c29394b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexModComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexModComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Indexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Indexer.java
index d51248a..57ab79d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Indexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Indexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java
index 4c26544..7d458ed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java
index 6497f45..6e5627c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Longs.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Longs.java
index 2942bf0..6c332db 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Longs.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Longs.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeReader.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeReader.java
index 4e86565..95c8425 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeReader.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeValue.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeValue.java
index c083a21..862ee6a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeValue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeValue.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OctetStringKeyComparator.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OctetStringKeyComparator.java
index bdc6bfc..e206339 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OctetStringKeyComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OctetStringKeyComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
index 723367c..7400b9c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/PresenceIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
index c345f8e..bb4a8f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/PresenceIndexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
index 91f8cf2..504f0cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
index 26c2bc6..e326bd2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyConfig.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyConfig.java
index d1e7748..79084d7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
index c019715..f19a451 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/package-info.java
index d6e0cdc..79d16de 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/backends/package-info.java
index 8bc15a4..119096f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/FailedDependencyAction.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/FailedDependencyAction.java
index 13ff1d2..aea4c64 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/FailedDependencyAction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/FailedDependencyAction.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
index 816af4b..4d8dcbe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
index 4c16d94..a305cca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
index d45975b..f6054b6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
index d422ee1..2dda40b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java
index 9d2f57b..ef54472 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java
index c2e39a4..cd154a5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/task/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/backends/task/package-info.java
index a80fb4b..5fab08b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/task/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/task/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 5d13800..c1adf8e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
index c8c1d2f..adbd76b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigConstants.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigConstants.java
index c81b283..096ea89 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
index 67c908a..5c91615 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java
index 4c6dae1..e091709 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
index aeb12af..d6ba5d4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
index 553678d..ed88c59 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index f80708b..aae2c11 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java b/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
index 5b6b180..44574eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
index 3532ca5..23c0dab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
index 75ad356..53a74f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
index a240f9d..d4382b9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/config/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/config/package-info.java
index 7779328..d294f69 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/config/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/config/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java
index d85608e..2f57437 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java
index 08587b2..b439f40 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index 99d9646..c2cbfb5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
index 95e2d49..080e655 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
index a876ac7..43621f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
index 70b65a7..3116f02 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
index 60aa7db..27f2536 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
index 0a6c0e2..86a8695 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
index bd1cb35..a61b51b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java
index 796bb55..78aed3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java
index 10a9bf3..7ddfc55 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
index 84095fe..703f4f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
index dc9d558..e73338a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
index 6397bc9..1e9c4f3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyErrorType.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyErrorType.java
index fd4b606..e4e8f9f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyErrorType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyErrorType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
index f542cc2..57216ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
index 9f0b316..b73500e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyWarningType.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyWarningType.java
index eb161c4..19e7e6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyWarningType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyWarningType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchChangeType.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchChangeType.java
index 87f64ca..128b5a5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchChangeType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchChangeType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java b/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
index 1bd7ae0..3bbd813 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
index 3e0b530..55d5a4f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
index c8410a1..7841df2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/controls/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/controls/package-info.java
index 2ad7fcc..9d6c67e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/controls/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/controls/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
index 1610cb7..fb1a466 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java b/opendj-sdk/opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java
index 952bf51..13b7ee7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
index 3e9519f..496af4e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index cb848b7..6c56e07 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
index fb4d1bd..844ee2e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java b/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
index 551dd84..265be11 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
index c3ee9e8..534460c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
index 4abd5f6..8087e33 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
index 8d5afb4..0d499c9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
index b56a6f1..631848d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index 42756ab..e940b47 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
index 1e96e79..43c015b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConstants.java b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConstants.java
index a11609d..cf332fb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/CoreConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/CoreConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java b/opendj-sdk/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
index d12d2c8..9bccfd3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
index 8ba91b8..e57ab86 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index e6eccfb..e3282a0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServerShutdownHook.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServerShutdownHook.java
index f1aa100..8529924 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServerShutdownHook.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServerShutdownHook.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
index 9350080..7a9ceea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
index 156a48f..307d9f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
index 26ef58a..d365fab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
index 4a9bab7..914871e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index 020fdf6..47050f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
index b21868e..e5ae8eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
index 78f46c9..6d6ce21 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
index e7c5aff..84ff3c0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
index 4c79104..8352607 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
index 81fd57f..8e851e7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
index ce0159f..4922a56 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java b/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
index 9f4128b..53fe24b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
index 83f5d4e..808575f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
index 1b1a3a9..4f43ad2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
index 3651309..07cea50 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index 40ee5c1..18ca927 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
index 26a6394..0d10d51 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index 9953baf..e71be2b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index 74a5736..e3b8649 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java b/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
index e4f4a4b..34be963 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
index 791fd6a..3d7d0a1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/RFC3672SubtreeSpecification.java b/opendj-sdk/opends/src/server/org/opends/server/core/RFC3672SubtreeSpecification.java
index 61a89e1..c715aa3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/RFC3672SubtreeSpecification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/RFC3672SubtreeSpecification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java b/opendj-sdk/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
index 232b59d..0e6d031 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
index e6c549e..4f75047 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
index 811762b..9eb1f7c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
index 4bff723..50fe638 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
index dbe0239..9f4f744 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/ServerShutdownMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/core/ServerShutdownMonitor.java
index 964c564..a562829 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/ServerShutdownMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/ServerShutdownMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SimpleSubtreeSpecification.java b/opendj-sdk/opends/src/server/org/opends/server/core/SimpleSubtreeSpecification.java
index 4cc88d8..b8f8203 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SimpleSubtreeSpecification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SimpleSubtreeSpecification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
index 4474658..fd9266f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
index e433490..caae610 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
index 7dd1dd6..945c4cd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/core/package-info.java
index f83fabf..015552f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index 465cc62..27662e2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
index 2105a97..0cee170 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
index eed82fc..2840515 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 4326ee5..3cc0390 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
index ba5bae4..209040d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/CertificateValidationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/CertificateValidationPolicy.java
index ae7c859..98e1c2b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/CertificateValidationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/CertificateValidationPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
index fc834f8..38832c4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 566eb39..a12d0c9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
index d38fb79..5b5efc4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index 04dd705..3ee3dea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
index 8262097..346a4e1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index d4f5d56..c26da0b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 839965a..eef49f3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExtensionsConstants.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExtensionsConstants.java
index edb7f94..29dd7e4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExtensionsConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExtensionsConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 207ede2..2961633 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
index 37696af..f70adde 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 445365a..157984f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 2ebaf4b..655fd8b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
index ddab6a5..288a95e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 8448fe3..a6732a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index f0a7293..64af5b6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
index 83939c4..fa41622 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
index 927643a..3049364 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
index aa330e5..811780b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
index 2ab2ba1..ec47eeb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
index f47eb57..be2d32a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
index 14a742e..b1b3f19 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
index a45cbf9..8c6b92a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
index cae6d48..b102b3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index bad56c0..a222907 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 45978c0..73e040d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
index 61f8d01..8f92a6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
index d978ac0..51c64ef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 00dc392..6edf775 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index cb48b60..94ec9a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index be17b93..c4cab1b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index cffd419..3a04313 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index 3e7c429..d28d5ef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index e2b5d5b..0756c4c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
index 9e8c62e..4639934 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index c6b53ff..58829db 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
index 769e45c..d5f2335 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
index 95907a0..5c1aafb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 56efdae..5964f20 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index f9aebd4..3c88e17 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
index a396167..6831ee8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
index a7371b8..360fab8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
index b2507ca..152f3ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
index 57f6d11..eba7cef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index f9e7c9e..3f6570b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
index 5ebdf9c..646d73d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/package-info.java
index b4ed4cd..312dbc8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java b/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
index 71978c2..7d9c485 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/interop/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/interop/package-info.java
index b57fa70..8332db5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/interop/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/interop/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/Access.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/Access.java
index 268d018..38c5ba7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/Access.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/Access.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/ActionType.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/ActionType.java
index df4464b..fa590aa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/ActionType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/ActionType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/AsyncronousLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/AsyncronousLogPublisher.java
index 86d32fd..8670895 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/AsyncronousLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/AsyncronousLogPublisher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
index 4b5d3ee..a56c5fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
index 5f7175a..0380dff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
index e780174..0c7d33e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileFormatter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileFormatter.java
index e974e40..02b804a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileFormatter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileHandler.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileHandler.java
index 7422a78..5a453dc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryLogLevel.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryLogLevel.java
index 178572e..819a59f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryLogLevel.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryLogLevel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/EncryptAction.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/EncryptAction.java
index c6caa04..b910254 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/EncryptAction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/EncryptAction.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/Error.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/Error.java
index dcb247e..a52412a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/Error.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/Error.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileComparator.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileComparator.java
index 793b1f4..e20b91b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNamingPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNamingPolicy.java
index d13cd4e..ba76ea8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNamingPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNamingPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
index f03f7cb..7f9e2f4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
index 0ca8b42..e448d41 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index 7488391..7e2c0cd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/GZIPAction.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/GZIPAction.java
index 372c432..e3f18eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/GZIPAction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/GZIPAction.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/InitializationErrorManager.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/InitializationErrorManager.java
index 52461a0..1f4f4c8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/InitializationErrorManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/InitializationErrorManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogCategory.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogCategory.java
index 09884fd..e28fc76 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogCategory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogCategory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogErrorHandler.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogErrorHandler.java
index f54b849..a0cd43a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogErrorHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogErrorHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogFileFilter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogFileFilter.java
index 4c8de2e..a27cba9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogFileFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogFileFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogLevel.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogLevel.java
index 76e13be..206f029 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogLevel.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogLevel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogRecord.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogRecord.java
index 3e3f18e..0daf101 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LogRecord.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LogRecord.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/Logger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/Logger.java
index 47c5426..5cab7a3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/Logger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/Logger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerAlarmHandler.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerAlarmHandler.java
index 8910caa..b4de231 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerAlarmHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerAlarmHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
index 6583658..1f7d603 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/MeteredStream.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/MeteredStream.java
index 37d8dbf..3431642 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/MeteredStream.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/MeteredStream.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
index 1e254cd..6cbf18c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/PostRotationAction.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/PostRotationAction.java
index 067d5b2..c9063a7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/PostRotationAction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/PostRotationAction.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/RetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/RetentionPolicy.java
index 1662ad7..47121d9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/RetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/RetentionPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationActionThread.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationActionThread.java
index 90e46b7..f82f950 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationActionThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationActionThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
index 6cd185a..74f6255 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationPolicy.java
index 2ef27c8..e374a39 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/RotationPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/SignatureAction.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/SignatureAction.java
index dafc47c..7954d20 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/SignatureAction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/SignatureAction.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index fb85c18..ca4b632 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
index a8591c2..481dc86 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/StartupErrorLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/StartupErrorLogger.java
index 73fa59e..1c4b39a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/StartupErrorLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/StartupErrorLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogFormatter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogFormatter.java
index 5a9a08e..7f67b84 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogFormatter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogPublisher.java
index 954a097..39b558a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogPublisher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextWriter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextWriter.java
index 1d67826..73717e1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextWriter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
index 436f2e3..0873dcb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeStampNaming.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeStampNaming.java
index e389e97..5664c21 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeStampNaming.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TimeStampNaming.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/ZIPAction.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/ZIPAction.java
index 0549dbd..9f2befa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/ZIPAction.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/ZIPAction.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugErrorHandler.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugErrorHandler.java
index 08d1b3a..953f866 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugErrorHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugErrorHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
index ada56ed..8a9b29a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogRecord.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogRecord.java
index 4bd8d4f..ae94b4f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogRecord.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogRecord.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
index d4b0e4a..ba77396 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugStackTraceFormatter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugStackTraceFormatter.java
index 7bcf002..8204e19 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugStackTraceFormatter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugStackTraceFormatter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceConfiguration.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceConfiguration.java
index 0120e6e..1f71697 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceConfiguration.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceConfiguration.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceSettings.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceSettings.java
index b9446ae..2ea1daa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceSettings.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceSettings.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
@@ -115,4 +115,4 @@
     this.stackDepth = stackDepth;
     this.includeCause = includeCause;
   }
-}
\ No newline at end of file
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/Tracer.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/Tracer.java
index 7afed30..04fe4d2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/Tracer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/Tracer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
@@ -1026,4 +1026,4 @@
     return getEffectiveLevel(settings, category);
   }
 
-}
\ No newline at end of file
+}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/package-info.java
index 90557b4..4c90410 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/BackendMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/BackendMessages.java
index 07671fc..280bfbb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/BackendMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/BackendMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java
index 5c6be35..2a9ed6c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ConfigMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/CoreMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/CoreMessages.java
index cb19542..5811b66 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/CoreMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/CoreMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ExtensionsMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ExtensionsMessages.java
index 48e3ffc..dbb9802 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ExtensionsMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ExtensionsMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/JebMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/JebMessages.java
index e4af14a..3c145a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/JebMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/JebMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/LoggerMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/LoggerMessages.java
index 3452885..2895bb0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/LoggerMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/LoggerMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java b/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
index be3bc5a..80f92f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/PluginMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/PluginMessages.java
index 1c8c791..289dbba 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/PluginMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/PluginMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ProtocolMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ProtocolMessages.java
index d3684d1..6d6a2b5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ProtocolMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ProtocolMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/SchemaMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/SchemaMessages.java
index f9a1752..308a94b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/SchemaMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/SchemaMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/TaskMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/TaskMessages.java
index 875d984..0fcd0c6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/TaskMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/TaskMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
index 978c092..f4c9920 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/ToolMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/UtilityMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/UtilityMessages.java
index 89bede4..947c996 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/UtilityMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/UtilityMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/messages/package-info.java
index a2a1d52..24fe92d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
index a1516cb..09cef62 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
index 014ac73..d369c66 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index 41f7711..cbacd0f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
index 475bec7..f2d8d76 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
index e418880..f2865cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
index a4977c7..9b4628c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
index 60da8f4..f86df1d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/monitors/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/monitors/package-info.java
index 84aed44..8636d9e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/monitors/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/monitors/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
index 451d8e5..cccc249 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
index e7d7754..5270c32 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
index f8f6f14..96a3d56 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 2483b9e..cc0b9f6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/package-info.java
index ca9fd73..53bfdc6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
index 8936797..b9b6435 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
index ef47b69..f12e0ac 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
index 39b6c51..dc34df3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
index d20973a..b94c590 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
index e590508..ae5e0be 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/package-info.java
index 342f186..c2117e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
index b000267..ba2b28a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Constants.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Constants.java
index 5482d55..3b74439 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Constants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Constants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
index 4d0d00c..576686a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
index 6529920..e9137b0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
index 25888c2..2792302 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
index a473358..4c06dfa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
index 5310de7..0dd09f9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
index 936179a..fe9f005 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
index bdc1499..35af76e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
index 7d825cd..97ec560 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
index e1096dd..13cfad7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
index 77099e9..ec451dd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
index 0e63257..efe9576 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/package-info.java
index 580291b..eb563ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index cdb3725..bae36ca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
index 0f2506b..7bc4c0e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchListener.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchListener.java
index 0d0f25a..e0d2326 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchListener.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
index 38182e6..04b5b79 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/package-info.java
index 6a6c21a..abc5341 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/internal/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/Credential.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/Credential.java
index d95bf68..2325963 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/Credential.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/Credential.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
index 688ffae..1358ae9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index 9d2ed2c..4d2a86d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
index 6531121..c653629 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index ac1ce87..979bc5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java
index b1c28eb..43548a2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
index 06fa7fc..e0fb0a3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
index 431baf0..583b968 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
index 05ce940..1ddf444 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
index 4823fdf..1a2cbc1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
index 59d660e..3349e07 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
index 93398bc..231083d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
index c002d36..d0201c2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
index f3fb8a2..f70cead 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
index 571d8e8..d0397ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
index 2bd80f4..c69f1d1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
index 018bf2b..ed0628d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
index 685672a..f1cc462 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
index 93729a6..8e9bac4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
index f563b01..3db1f2d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
index 52aba81..e325b79 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
index 18e06c4..21cf233 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
index a1743a1..3ef414f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
index 0025615..9354dd2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index ced3010..d60b933 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 06e4ac7..3747a87 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConstants.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConstants.java
index 9a8dace..34a0fef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
index cf8d9e9..768e5dc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
index f6e6e4d..041cab4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
index 16f2db5..8156afb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
index 281550a..b87180e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
index b77f529..7d226f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 5bce624..649ea69 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java
index c9a9720..9fc0e0f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
index 71c5821..1295ad5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
index 340586d..a21fa09 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
index 5584b26..2db80e4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
index 4829a15..8662784 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
index 495db50..12bef5f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
index 17c6c9e..685c676 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
index 79b3590..77a7404 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
index 8e96ad5..b55e53d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index 6cc92ac..f3f8b67 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
index caedf00..d73392c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
index 2e385d2..a720ee9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/package-info.java
index 4d764a2..b31e0f6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/package-info.java
index 7431f8e..af211e6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
index 05a5cfc..980be4d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index 2c6a4a6..81d5ce7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
index 6bace79..0fae838 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index 9b5e6a7..9498add 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index 27428fe..6b693cb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
index 25e100c..6570e65 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 6ab01aa..9318904 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
index 15c53ab..23b1f4d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index c4b68e2..19df104 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
index d641048..9379d1a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
index 4ee92e6..41067ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index 07be814..fd24ae9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 353a66f..8ed1ac4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 9701150..181f430 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
index d4084ef..b33ffb5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index 5bcf020..c2a78f5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index e167d35..8b25b8f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index a21f428..56bf153 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
index 0b95eea..881152e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
index d2ecc29..4f50ff0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index 57b3061..b3cfe98 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
index 010db79..6273978 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
index a5f68cf..6527358 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
index dbc53fd..a52a6cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
index 1d9a9da..3c489e4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
index 0fb090c..eff7e95 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index cb70305..5ffd0f2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
index 2028b77..630882d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index 89a9295..019a353 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index 09cc76d..f7ce30a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index c251152..1a0f60b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
index 6edae19..bd7908e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index ede194f..8f920b2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index 1fdb971..a73d7b0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index 8c84ec8..9221ab0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
index 94459aa..df117f1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
index 9f21b5d..00be016 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index c3affcc..75ece4a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index 363cd00..d81624f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index cece249..08aaf99 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
index 26b29d7..479e971 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
index 27bce79..e2edfe8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index da5c38d..167f584 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
index 1d3f8c1..f219a19 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index 87aba3c..8d90cda 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
index 2a2b8ce..ecd12af 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
index 3722700..61c671b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
index 28c6048..42f47be 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 477e040..4ae980c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 56ec8a2..3f1caba 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index 991041f..a509fa3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 0669856..78a4beb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
index db48105..0c87f11 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index f920817..d96a219 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index 76337df..bb94638 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index 4ab97e9..68134c0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
index 15fa3ac..88ff296 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
index 4c37f0f..f79cc4b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 240ea1e..cc303b3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index a14884d..a1ffea6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
index 0e4a98d..db5256d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
index 17b89ae..83bc08a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index dbf0f56..53e2e97 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
index 0c618c5..5724c71 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
index fb0f789..6329762 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index e9dc274..5778ce2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
index 3b54901..735fa0a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
index 5c7f3c6..53102d0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index 5b89c9f..050b8ed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
index c39c677..908b2d9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
index abb9e4e..4b13003 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
index 411a4ab..9071239 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index 1831b2f..89ebc2a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
index b5c3230..a9dd4a3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
index 7ebcf07..8b574ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SchemaConstants.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SchemaConstants.java
index f54fa1b..c7c605e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SchemaConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SchemaConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index 822a54f..1ea9e92 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index a85c213..38f9709 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
index 308cea5..d2a4b3c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
index 22fdef3..6323066 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index 86ec54e..bc250d3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 734ca26..1cbf736 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
index 1e31f85..58a4bf1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
index f544902..d2aa8b1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 273d1e5..06fcef5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index cccc008..bb00722 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
index ed29215..4d3472e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index a3cfe82..78db730 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index 1025f5e..7a5dc0b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
index ec844cd..f66e9e2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
index 94f64d3..dc79b8f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
index 93a6713..ece9647 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/schema/package-info.java
index b79640f..1026c91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java
index 9ec4858..54a5cc5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java
index ca9288f..48c6cc9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
index 300bda3..64bf887 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java
index aeda2ca..e13d519 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java
index b54336a..d7e0e2a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogCache.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java
index 81f399a..1f9c67f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDB.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java
index 8e48e87..72e6783 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java
index 70b44d0..75bea43 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java
index 899ed59..940017c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java
index 97a413f..1594962 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java
index fe7632b..67bb054 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java
index fb91ddb..eebf9cb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java
index ebd5d63..8f55352 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/DbHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java
index 09a1b0a..ccebb88 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
index d3b5393..3cee58d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java
index 3473f29..6f2e451 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java
index f3a1ced..c2301e6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java
index 8912451..eda7272 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/package-info.java
index fabaa14..fe582ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java
index f5d566a..fc29781 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
index 54cfa8f..aa311fb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumberGenerator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/LogMessages.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/LogMessages.java
index 3998104..bab9527 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/LogMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/LogMessages.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ServerState.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ServerState.java
index 16eeb5e..6a7c08a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ServerState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ServerState.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/package-info.java
index cbe976e..c2077d1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/common/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/package-info.java
index 9058eb0..66a3381 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java
index 408ba62..a967b8d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java
index 0bd8357..336b83a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java
index d545a51..aa6ddf5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ChangelogBroker.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java
index 1629815..21b53ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java
index 9d16e11..993ba00 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java
index 65147be..b0bc862 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java
index eabf389..d5c490d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
index 42614ed..c1226a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
index 14b5894..fb86913 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java
index 5a612ee..6930b03 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java
index 34d5b95..e466ddc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java
index 0e7496a..52b6dca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
index 54ad15b..22d701d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java
index 78f44ff..acbecc0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java
index b993a45..c9e335f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PersistentServerState.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
index 8635b4b..95c4412 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java
index e37a5b2..26b85df 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java
index 334b98c..e1bedb0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/package-info.java
index 7751bda..6dd14f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java
index 7d7d4ed..97a437f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java
index 796793c..e873d3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java
index b4ef2f8..5d50687 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java
index 7fbe340..8023132 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java
index 6e7f6a7..7d706f3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java
index e3b362e..259ef9c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java
index a6d3cc4..d475b5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java
index 19ce2a1..be33dd9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java
index dd007d4..6d634b4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java
index a427eea..39a3b4e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java
index 373ee7b..1883eca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java
index 1b97bab..eeb0f78 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java
index a1ff9e7..d356b91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java
index 47589f6..bba5e84 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java
index a706721..877236b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
index 95b7712..b57cc5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java
index 57364f8..aab19be 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java
index b039236..337abf0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java
index 1f6f5b9..7429e21 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/package-info.java
index c6e6d8e..3b8ea6a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
index 38b9e30..a83f09c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
index 9c3c4ea..00a93de 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
index a93d3fc..4367907 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
index 3064ddb..b351d02 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
index ac3b712..19c5203 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
index 6896166..63bd3ee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
index dd4f081..ef90196 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
index 279b7f2..5db489e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java b/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
index 5268784..c57b546 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java b/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
index 7927fe6..3ab90fc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ClientException.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ClientException.java
index 2d9d9dc..9b2d4fe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ClientException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ClientException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
index afa443f..b262629 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java b/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
index f77ca35..c5f9635 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
index 8fb66da..1caaea9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
index dfaac1d..e39d51f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index 3caf3f0..6efc4df 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
index ab8caec..39387bf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
index bf9d461..0a0d528 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompareOptions.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompareOptions.java
index 9ffb36e..5796e22 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompareOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompareOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnection.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnection.java
index 4e8bd5c..652a3c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnection.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnection.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionException.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionException.java
index 505a122..8756543 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionOptions.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionOptions.java
index 6be7604..42bf06a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
index 341e0d3..54ae085 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDeleteOptions.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDeleteOptions.java
index 8f9ffd0..bb8a7ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDeleteOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDeleteOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
index d15a5a4..f6d781e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModifyOptions.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModifyOptions.java
index d37ee63..d5b4c03 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModifyOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModifyOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
index 6345b6e..3e50a1d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
index cf26e52..d3f9ea3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearchOptions.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearchOptions.java
index aaf3daf..460c1f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearchOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearchOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolOptions.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
index 85a15b1..8abeee7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolUtils.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
index f56304b..c8725c6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
index d941540..fc8274f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
index 0a67737..8632efa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
index 561399d..0698eb1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java
index 7d23dbc..9fb8af1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java b/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
index 7357398..3abe4d0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java b/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
index f4cddbd..a92f10a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionException.java b/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionException.java
index 2d43a0e..7e5160e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
index 01a466f..5ef1cd7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
index 8c4ba44..75a149b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
index 3a7e80d..289e006 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java b/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
index 76bcde9..9b07ff8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java b/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
index 50d10ac..1be9f02 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java
index c548adf..681f3db 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
index fd1a3fe..83d95e3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/DNTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/DNTag.java
index 6490e21..86ab7e4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/DNTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/DNTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/EntryWriter.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/EntryWriter.java
index 139b74b..0cdd6ee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/EntryWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/EntryWriter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FileTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FileTag.java
index 0917907..58d8dca 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FileTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FileTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FirstNameTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FirstNameTag.java
index 1817542..8b618bc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FirstNameTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FirstNameTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/GUIDTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/GUIDTag.java
index 46082f3..de6f1e6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/GUIDTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/GUIDTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
index 83c01dd..a3bca3c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
index 2a99587..ab5f303 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/LastNameTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/LastNameTag.java
index c2032e5..8823da4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/LastNameTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/LastNameTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
index be9f14b..285e6fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java
index 4c27270..e3a5b9a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
index 6614c53..d4eff93 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
index 82ba0be..36c3702 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/ParentDNTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/ParentDNTag.java
index c44747b..3c4dc7b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/ParentDNTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/ParentDNTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/PresenceTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/PresenceTag.java
index e467c25..d4a5b2b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/PresenceTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/PresenceTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RDNTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RDNTag.java
index 5dc5b8c..4fda9b0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RDNTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RDNTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RandomTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RandomTag.java
index 0585ead..ac824e0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RandomTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RandomTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/SequentialTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/SequentialTag.java
index 32c2374..dda1d50 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/SequentialTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/SequentialTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/StaticTextTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/StaticTextTag.java
index 85e7084..abd6d92 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/StaticTextTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/StaticTextTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Tag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Tag.java
index 918f0a3..95048e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Tag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Tag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TagResult.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TagResult.java
index b83b078..dcb349f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TagResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TagResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
index c6865f5..9d7a567 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
index 18ebd2e..c895de1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateFile.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateFile.java
index cc995d6..5b001b0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateFile.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateFile.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateLine.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateLine.java
index 5c6c6f8..8bffab4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateLine.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateLine.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateValue.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateValue.java
index 151b61a..0abc9c0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateValue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateValue.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java
index ac56225..b850418 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
index d7d6a4c..40219bf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/tools/package-info.java
index 4fbc754..a722dd2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AcceptRejectWarn.java b/opendj-sdk/opends/src/server/org/opends/server/types/AcceptRejectWarn.java
index 6f204e5..60c5f3f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AcceptRejectWarn.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AcceptRejectWarn.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java b/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
index f65da95..3400d0a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotificationType.java b/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotificationType.java
index 3e7144a..eed51b2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotificationType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotificationType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java b/opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java
index 856244e..f2dcb79 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java b/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
index 1ce5d61..f4ed4b1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
index 1c01425..03759cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeUsage.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeUsage.java
index b510ed0..e3d19ed 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeUsage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeUsage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
index 5757aea..da72fc2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
index 335292b..fe8f462 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java b/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
index 94af625..6103c03 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationType.java b/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationType.java
index 3358ef7..f6c0bfb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
index dff2a37..0cf8952 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java b/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
index b4dd07e..ce8cd85 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java b/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
index 27d4fa4..e709968 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ByteString.java b/opendj-sdk/opends/src/server/org/opends/server/types/ByteString.java
index 42f6588..909131b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ByteString.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ByteString.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java b/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
index 7558f32..43c1052 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java b/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
index 2e70123..fd995cd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java b/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
index 776c32d..afe3149 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CancelResult.java b/opendj-sdk/opends/src/server/org/opends/server/types/CancelResult.java
index 7f03e59..c38ca93 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CancelResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CancelResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java b/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
index 18e60ce..e7a523a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CommonSchemaElements.java b/opendj-sdk/opends/src/server/org/opends/server/types/CommonSchemaElements.java
index b0832ae..9aecc9e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CommonSchemaElements.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ConditionResult.java b/opendj-sdk/opends/src/server/org/opends/server/types/ConditionResult.java
index 505ebdf..e2a2fc6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ConditionResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ConditionResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java b/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
index bb60fd6..41986e3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Control.java b/opendj-sdk/opends/src/server/org/opends/server/types/Control.java
index a287d28..2ab7835 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Control.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Control.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java b/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
index ffb9bfd..af6b081 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java b/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
index 05eac21..00f6fb5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java b/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
index 0b058c0..b947110 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DN.java b/opendj-sdk/opends/src/server/org/opends/server/types/DN.java
index 05757ee..519cda7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogCategory.java b/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogCategory.java
index 729794c..b9832f2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogCategory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogCategory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogLevel.java b/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogLevel.java
index c1ad59d..7df9587 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogLevel.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DebugLogLevel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DereferencePolicy.java b/opendj-sdk/opends/src/server/org/opends/server/types/DereferencePolicy.java
index 5c62e18..a26622d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DereferencePolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DereferencePolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
index df4d65e..5ccefec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
index ca71913..26576b8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/DisconnectReason.java b/opendj-sdk/opends/src/server/org/opends/server/types/DisconnectReason.java
index bd3caef..83dfb98 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/DisconnectReason.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/DisconnectReason.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
index 069357f..ed411e7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogCategory.java b/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogCategory.java
index 5df30b1..c45f8d4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogCategory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogCategory.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogSeverity.java b/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogSeverity.java
index f1c6c70..7a579d2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogSeverity.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogSeverity.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ExistingFileBehavior.java b/opendj-sdk/opends/src/server/org/opends/server/types/ExistingFileBehavior.java
index ecbd397..e41b894 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ExistingFileBehavior.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ExistingFileBehavior.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/FilePermission.java b/opendj-sdk/opends/src/server/org/opends/server/types/FilePermission.java
index be54a9d..28970ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/FilePermission.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/FilePermission.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/FilterType.java b/opendj-sdk/opends/src/server/org/opends/server/types/FilterType.java
index 92cd813..c0079f2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/FilterType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/FilterType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java b/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
index 0106c33..9a2816d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java b/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
index 5b59fc0..fc5c74d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java b/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
index 0d4ed9a..945ae46 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java b/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
index 8d852cc..a885533 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java b/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
index 4af6a40..79c2cd2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
index 7bc7750..5b7bf21 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
index 7fd01dd..55e00e3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java b/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
index 332978d..064a5f6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/LockType.java b/opendj-sdk/opends/src/server/org/opends/server/types/LockType.java
index 5132a9c..e42685d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/LockType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/LockType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java b/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
index 123fbc3..73937c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java b/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
index 9f6f64a..e1a527b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java b/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
index f808330..dec4714 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java b/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
index aecc213..b58af4b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ModificationType.java b/opendj-sdk/opends/src/server/org/opends/server/types/ModificationType.java
index b96e766..8b89eab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ModificationType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ModificationType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java b/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
index 9c374c5..2ccc00e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java b/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
index 635a1d1..d1acc0f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/NullOutputStream.java b/opendj-sdk/opends/src/server/org/opends/server/types/NullOutputStream.java
index 00e570d..61b50c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/NullOutputStream.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/NullOutputStream.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java b/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
index a6976ef..01b4a9b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClassType.java b/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClassType.java
index f28d987..1882ead 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClassType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ObjectClassType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/OperatingSystem.java b/opendj-sdk/opends/src/server/org/opends/server/types/OperatingSystem.java
index 9cd5ad8..ac3f444 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/OperatingSystem.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/OperatingSystem.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/OperationType.java b/opendj-sdk/opends/src/server/org/opends/server/types/OperationType.java
index eaa1353..bc6db1d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/OperationType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/OperationType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Privilege.java b/opendj-sdk/opends/src/server/org/opends/server/types/Privilege.java
index f04533d..a08aa88 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Privilege.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Privilege.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java b/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
index 7ef37bc..4d968ba 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java b/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
index 36d6668..c8b052c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/ResultCode.java b/opendj-sdk/opends/src/server/org/opends/server/types/ResultCode.java
index c5cc7f5..0c3ea76 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/ResultCode.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/ResultCode.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SSLClientAuthPolicy.java b/opendj-sdk/opends/src/server/org/opends/server/types/SSLClientAuthPolicy.java
index c6bc3e4..edee3c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SSLClientAuthPolicy.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SSLClientAuthPolicy.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java b/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
index a46f0dc..c211677 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SchemaFileElement.java b/opendj-sdk/opends/src/server/org/opends/server/types/SchemaFileElement.java
index ca1ca95..30571f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SchemaFileElement.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SchemaFileElement.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
index b388854..d2f5773 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
index bec4c21..67319ff 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
index 7c3724f..0a448e8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SearchScope.java b/opendj-sdk/opends/src/server/org/opends/server/types/SearchScope.java
index 63b6c5e..b9c34ce 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SearchScope.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SearchScope.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java b/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
index 58be2e8..404bc1b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/WritabilityMode.java b/opendj-sdk/opends/src/server/org/opends/server/types/WritabilityMode.java
index 676dc2c..c28443e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/WritabilityMode.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/WritabilityMode.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/InProgressOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/InProgressOperation.java
index e9d7333..e74e469 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/InProgressOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/InProgressOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PluginOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PluginOperation.java
index a1df6ea..bdc9f8b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PluginOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PluginOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java
index 19933db..b5678b0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
index df24ae8..ab76996 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationBindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
index 6300d2b..a5cc1cb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
index 661ae76..c77e6f9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
index d0f0c96..329e1a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
index bf25527..c089051 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
index 2314d15..8af7424 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
index 4b9a47a..12ca3bf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationOperation.java
index 066d6e0..7a94606 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
index 880650b..2e4d3a5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java
index 501d53b..2c30f05 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
index 8a06109..c565c38 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseBindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
index 9e2b2b9..cd453a9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
index 0d8f3a2..0f58233 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
index 8505391..8ae0d6c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
index 9351acb..5f9a72e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
index 6041af2..b1fbbe6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
index c275dfe..87e27bc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseOperation.java
index 830b8c5..c68754a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
index a408019..1b13d3c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
index 02c64c3..7f994ec 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationBindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
index a1314be..03d4822 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
index bd49817..34e8a36 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
index 96edecd..f1a9feb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
index c6fb60a..362bb28 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
index 09045fd..efb2784 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
index 2148f69..8b9cf75 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationOperation.java
index df9ef3c..d7a523e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
index 00f7b96..a3af78f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java
index 15d8803..12fe4fb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAddOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAddOperation.java
index 9af117b..dcef984 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAddOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAddOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseBindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseBindOperation.java
index 760cac2..cb6c335 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseBindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseBindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseCompareOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
index bd8cb11..7999f57 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
index bbf66f6..00f3b6d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
index 3942332..f5156c7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
index 3c829d3..8f6addd 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
index f4fa0b5..433acc6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseOperation.java
index 77d8534..27c0f6c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
index 158582e..e9405d5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java
index ac3cad4..6b6060c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
index 9326ddd..fbad5a6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
index 8175639..095ef7d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/operation/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/types/operation/package-info.java
index f0db059..8c4c0e2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/operation/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/types/operation/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
index 711ddc9..80dfcad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java b/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
index f534e6d..a68a109 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ChangeOperationType.java b/opendj-sdk/opends/src/server/org/opends/server/util/ChangeOperationType.java
index f2bdc17..f4d78eb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ChangeOperationType.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ChangeOperationType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
index f4f6b21..0bf0dbf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
index 6dbe787..3b33afc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java b/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
index 1ae3070..ec1da24 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
index 2c19507..bc0143b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
index d6e8959..9a08203 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
index 234a275..0204db0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
index 7e64b2e..638b175 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
index 0e610cf..d4d4d48 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java b/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
index 84ec62f..47ac688 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java b/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
index 08e425d..ec766ef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/SelectableCertificateKeyManager.java b/opendj-sdk/opends/src/server/org/opends/server/util/SelectableCertificateKeyManager.java
index edfacad..ecc72c8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/SelectableCertificateKeyManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/SelectableCertificateKeyManager.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java b/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
index 0b1e518..c587d0e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
index 8de5295..3349640 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
index 24ba52e..e6f5d32 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/TimeThread.java b/opendj-sdk/opends/src/server/org/opends/server/util/TimeThread.java
index 165e8c1..1899d4e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/TimeThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/TimeThread.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/Validator.java b/opendj-sdk/opends/src/server/org/opends/server/util/Validator.java
index 68240f3..121492d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/Validator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/Validator.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/Argument.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/Argument.java
index 5ed009e..9612f3d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/Argument.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/Argument.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentException.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentException.java
index a821b17..e72297e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentException.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentException.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index c7d7380..7dfeb9f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/BooleanArgument.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/BooleanArgument.java
index a5c21da..0d6b660 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/BooleanArgument.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/BooleanArgument.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/FileBasedArgument.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/FileBasedArgument.java
index 6058be6..1be98ae 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/FileBasedArgument.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/FileBasedArgument.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/IntegerArgument.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/IntegerArgument.java
index 10f993c..b6a9fc2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/IntegerArgument.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/IntegerArgument.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/MultiChoiceArgument.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/MultiChoiceArgument.java
index f92f7ee..f1bafd2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/MultiChoiceArgument.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/MultiChoiceArgument.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/StringArgument.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/StringArgument.java
index 36f9811..ed055f4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/StringArgument.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/StringArgument.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommand.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommand.java
index 17619a0..4d3a274 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommand.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommand.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
index e11eda7..1c2ebb4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/package-info.java
index b9d6769..2783b23 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/package-info.java b/opendj-sdk/opends/src/server/org/opends/server/util/package-info.java
index 4be5f47..df7d6e3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/package-info.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/package-info.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java
index b882c42..394560a 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromFile.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromLDAP.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromLDAP.java
index c86bae9..4ee12b3 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromLDAP.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ConfigFromLDAP.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/DatabaseDescriptor.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/DatabaseDescriptor.java
index 2753a1d..62881c2 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/DatabaseDescriptor.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/DatabaseDescriptor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ListenerDescriptor.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ListenerDescriptor.java
index 6120945..e00532a 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ListenerDescriptor.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ListenerDescriptor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusDescriptor.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusDescriptor.java
index 5405a79..f33fab8 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusDescriptor.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusDescriptor.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusPooler.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusPooler.java
index 57b4c33..993b10e 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusPooler.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ServerStatusPooler.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/SplashScreen.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/SplashScreen.java
index c4617dc..7d8043a 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/SplashScreen.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/SplashScreen.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
index 9509499..7d7391c 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusCli.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
index b396de7..75a9669 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelLauncher.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelLauncher.java
index a3750b8..debb94e 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelLauncher.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelLauncher.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeEvent.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeEvent.java
index 785009d..d2a4e13 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeEvent.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeEvent.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeListener.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeListener.java
index 23ca92d..eb3403a 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeListener.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/ServerStatusChangeListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/StatusPanelButtonListener.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/StatusPanelButtonListener.java
index dfe3def..47c69af 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/StatusPanelButtonListener.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/event/StatusPanelButtonListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/i18n/ResourceProvider.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/i18n/ResourceProvider.java
index af2f35b..b3aabbe 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/i18n/ResourceProvider.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/i18n/ResourceProvider.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties
index a069ad5..9adaad5 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/DatabasesTableModel.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/DatabasesTableModel.java
index 841f3e3..ffcdd4e 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/DatabasesTableModel.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/DatabasesTableModel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ListenersTableModel.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ListenersTableModel.java
index 554d091..520a0cb 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ListenersTableModel.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ListenersTableModel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/LoginDialog.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/LoginDialog.java
index b16e1c9..e700e7c 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/LoginDialog.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/LoginDialog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ProgressDialog.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ProgressDialog.java
index ed88f6a..adc478c 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ProgressDialog.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/ProgressDialog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/SortableTableModel.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/SortableTableModel.java
index 7b18041..e9cc4b0 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/SortableTableModel.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/SortableTableModel.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java
index 8d40d02..e2238d1 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_startup.ldif
index 4dbe844..0d95a46 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_startup.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
index fb0a4a6..3cea5b0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
index 12efc48..db82d36 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
index f781240..b6dc312 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
index bbaac93..5dc7758 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
index eacf1d0..85076c0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
index 1fbe80d..24004a7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
index 22b8b8d..41d8d6c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
index c4a437d..639de43 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
index 443462d..9e599d0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
index 0935f38..e78b267 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
index 6fb90ac..bc9ac10 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
index bbba503..87a0997 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
index 227b1ea..300e18c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
index 43a1654..8e2abfe 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Append.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Append.ldif
index e21902c..e6263a8 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Append.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Append.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # dc=com sample LDIF file
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Example.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Example.ldif
index 7472792..71028ce 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Example.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Example.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # dc=com sample LDIF file
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Exclude.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Exclude.ldif
index 945471b..ff58c31 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Exclude.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Exclude.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 #
 # dc=com sample LDIF file
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Include.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Include.ldif
index a0796bd..9177236 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Include.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Include.ldif
@@ -14,12 +14,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 # 
 #
 # dc=com sample LDIF file
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Schema.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Schema.ldif
index 861d380..9f43e42 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Schema.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/Schema.ldif
@@ -14,12 +14,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 # 
 #
 # dc=com sample LDIF file
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/backend_start.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/backend_start.ldif
index feaf990..01a926e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/backends/backend_start.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/backends/backend_start.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif
index feec938..58de636 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=core tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
index 154aa87..9e7024f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=North America,o=core tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
index d099c6c..cdc55da 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
index f84a3eb..d46b109 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
index 3bd1f39..d6713f5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
index a54d9d6..b197983 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache 2,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
index b357e2a..f15b0da 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
index 8be234e..2e56dd7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
index 1c72d82..9c0f120 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
index 77e9578..82d9fa0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
index b9513d8..2ca94bf 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
index eeadc35..60286fd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
index a881375..10e380d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
index 7674a81..7c9e673 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif
index f488a57..bc83cd0 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
index dfce7ba..19fe4b9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: changenumber=100001,o=changelog tests,dc=example,dc=com 
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
index 938243c..03f7eb7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: changenumber=100002,o=changelog tests,dc=example,dc=com 
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
index 170c007..2e11ecb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: changenumber=100003,o=changelog tests,dc=example,dc=com 
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
index b03ed0f..83086e3 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
index c029349..c241fc1 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Generalized Time,cn=Syntaxes,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
index 74a0bd8..51e7ecc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
index 96550f3..c026a0c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Generalized Time,cn=Syntaxes,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
index a58213d..8f1f087 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: documentIdentifier=ldap cosine 1,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
index e9a7913..f918b5b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=new author,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
index b54d79b..c0160da 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=another new author,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
index 9fec20a..d520235 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=ldup subentry 1,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
index 29fde86..fa31399 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=ldup subentry 2,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
index 4643676..e2aec94 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=ldup subentry 3,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
index ce0bd0f..70d16bc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=named object,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
index db22ba8..6dcbedb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=named object 2,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
index b86cf6d..51f81be 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mmiller, ou=People, o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
index 029a630..111674e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
index 3360413..73e3b1f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-2,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
index e66ec79..396546c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-3,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
index 3e2f35c..8cae9e4 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-4,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
index 8b4b61e..75e87ac 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-5,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
index b49ec62..07fe045 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=server 101,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
index 070b6c8..4dff54e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=server 102,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
index 770db22..a88a55e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=printer 103,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
index 4ca9d56..04711c5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=printer 104,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
index 4503870..866ec28 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2377-tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
index be9e18d..d355a2d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=java object,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
index b18019a..95b5a5e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=corba,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
index cb97604..2a6d224 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=corba1,ou=corba,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
index 0f57bb3..ff54a06 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=calendaring,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
index cf7065c..3c724e3 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bmorris, ou=People, o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
index b029593..13e04c9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: 
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
index e7ec6bd..1b18a1c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: 
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
index 18e053c..554a608 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
index adbd30a..a0c93bc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiServiceKey=ldap service,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
index a016495..9caf62e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiServiceKey=bad service dn,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
index 03b06e1..01cb3e3 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=4001,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
index 98c78ac..b8c7abd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=5001,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
index 1b00779..d043303 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=6001,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
index 98399cc..0fea57d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=7001,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
index d31c4bc..8b38cfc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=extensible object tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
index 0ef29b9..46df9a9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=untyped object,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
index bb849fb..560ffe4 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=Account Activation Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif
index b9817f6..73d86c2 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_deactivate_account.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif
index d0a7299..cd78d40 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif
index f47040a..1e492d0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_expire_account_future.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif
index afc6e68..81c8381 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_reactivate_account.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif
index 9362ad1..d683423 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/account_activation/admin_unexpire_account.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=abergin,ou=People,ou=activation tests,o=Account Activation Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
index 6473ba9..292f193 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
index b47df6e..31ed1e3 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
index 03df13a..a5ee5e2 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
index 9b97b15..f5d185d 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
index b0de3a1..fe39e69 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
index 7c7dcd0..9ea125f 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
index 953dc8b..9e49f20 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
index f50bce3..55c61d8 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
index c9bcc55..4020677 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
index e8d06f6..f308442 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
index 3f447e4..8a26918 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
index 99f7413..aa80ea0 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
index 490b633..cad4229 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
index 0de5fe8..a1e331f 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
index cf9e36d..0ca8d08 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
index 8eec164..e9d894b 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
index 1a0fc0c..69872ce 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
index 1fd0d4e..4257905 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
index c98ab36..1e2b92b 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
index 812fcbd..1488805 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
index 45538c4..150fb3a 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
index 37e6dda..79cf4d6 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
index b26e308..9b35661 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
index 6028cf1..33af497 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
index 58ae3c6..0470628 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
index 211c8c5..8312bcc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=Bind No Pwd Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
index 38c931b..aaa16bd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
index 427d5f6..dd6feb5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jwallace, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
index a3029dc..8b9662a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bparker, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
index 14fece8..0c7653d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif
index 1047735..b0b30dd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
index d1e3912..15ddbcf 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
index ccc58fa..dc0e99b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=alutz, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
index 0b1a819..1fd18ea 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:uid=prose, ou=people, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_TLS.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_TLS.ldif
index ce595e8..5864274 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_TLS.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_TLS.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif
index 68d79b6..1ade8cd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_key_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif
index 62222d4..901e9c6 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/setup/enable_trust_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif
index 78dc2ff..8e538bd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_key_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_ldaps_conn_handler.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_ldaps_conn_handler.ldif
index df9f9c1..0706b15 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_ldaps_conn_handler.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_ldaps_conn_handler.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif
index 0500c7f..3028672 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/jks/teardown/disable_trust_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
index f6b2ec8..cfefa2c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=pkcs12 tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
index 39f1394..4f89129 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bparker, ou=People, ou=pkcs12 tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
index 3154674..27ef4bb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=pkcs12 tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
index d1addea..81949b0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:uid=prose, ou=people, ou=pkcs12 tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
index d372da2..4237df0 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_key_mgr_provider.ldif
index efb67fc..2ca7867 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_key_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif
index 096530e..0a149f6 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/setup/enable_trust_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_key_mgr_provider.ldif
index 300528f..f0248a3 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_key_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif
index df9f9c1..0706b15 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_ldaps_conn_handler.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_trust_mgr_provider.ldif
index 5df0fc0..4347757 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pkcs12/teardown/disable_trust_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
index c0c4e35..3d33a20 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mcat, ou=People, ou=password tests,  o=Pwd Policy Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
index d24b0c9..93c1a31 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog, ou=People, ou=password tests,  o=Pwd Policy Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
index 216fa03..d687618 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=pguy,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
index 1110c69..0f8cceb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=pgal,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
index db3138a..14d2ef6 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=sguy,ou=People,ou=password tests,  o=Pwd Policy Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif
index 4696d06..e4b84fd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_add.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif
index 04a6dbc..37e9aca 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_by_time.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif
index 0e8266d..c069d4c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_force_pwd_reset.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif
index 9ce447e..93cfa9b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif
index 9ce447e..93cfa9b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_idle_lockout_long2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif
index 0f73f59..c60de70 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif
index f9c2abc..bf33dcf 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_cnt_sales.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif
index a9c16a9..53dca34 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_long.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif
index 71728cc..bb0a48b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_lockout_dur_short.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif
index e410b4d..3b1fa3e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_max_pwd_age.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif
index f44b2c2..1ed5708 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_min_pwd_age.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif
index f34fd3e..d50edc8 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif
index 89033f1..274be09 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif
index 263f288..8434a74 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_last_login3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif
index 4e106e2..3b9ab11 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_pwd_policy.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif
index 36ea298..bca2894 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif
index a4c7bbf..3190019 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif
index faea9b6..4cf2f1e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif
index 14971ce..b9f5fef 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif
index 6cdc75f..908d2a4 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_change_user_pwd5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif
index 132929e..49bf8fd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_exp_pwd_no_warning.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-attr.ldif
index 9d5fb38..0da6e52 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-attr.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-format.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-format.ldif
index 6e88da4..9ea04d8 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-format.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_last-login-time-format.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif
index cdfd562..48d4d57 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_max_reset_age.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif
index e867f49..b725294 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_disable_preencoded_pwds.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif
index 25e95df..b7f8ee2 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_exp_pwd_no_warning.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif
index 5665467..50fa4b2 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-attr.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif
index 9c1c14d..c2a0a17 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_last-login-time-format.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif
index 329a0f1..e31f046 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_long.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif
index c1d1ba5..85d5d9e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_max_reset_age_short.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif
index cd2c38d..3200a9f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_enable_preencoded_pwds.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif
index 348b547..fa98d0b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_add.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_by_time.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_by_time.ldif
index 11ed947..91a2fe5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_by_time.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_by_time.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif
index 8516764..ec734a4 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_force_pwd_reset.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif
index 9ddd514..14b6972 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_idle_lockout_interval.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif
index b577bed..6829470 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_cnt.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif
index 16695e0..861ef3f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_lockout_dur.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif
index cd68367..4e17e1d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_max_pwd_age.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif
index fc82b3f..ae0355d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_min_pwd_age.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif
index fa1b3d0..24fada2 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/admin_reset_pwd_policy.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
index 4d8989e..652a19e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=Pwd Policy Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/rm_sales_pwd_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/rm_sales_pwd_policy.ldif
index 6c6fe93..3c54f00 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/rm_sales_pwd_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/rm_sales_pwd_policy.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/sales_pwd_policy.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/sales_pwd_policy.ldif
index 28e3e70..3fd4c53 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/sales_pwd_policy.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/sales_pwd_policy.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif
index de8795e..3694bd5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_add_attr.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif
index 208ef0b..4c15c4a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_force_pwd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mcat,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif
index 1910bbf..9935b9b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif
index 1157ffd..1032345 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif
index 40552ce..6847c0f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif
index 57fab58..7a1ef8f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif
index bc4c41e..ad60d0a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mward,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif
index 9af1b50..4291825 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd6.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bjablons,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif
index 933cf69..b40d85f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd7.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif
index 71da251..272ebe7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_change_pwd8.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mdog,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif
index c4e272a..1d6ff73 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_del_attr.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif
index 02b1377..885e505 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif
index 2d454ce..6294ef7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_policy/user_reset_pwd4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=dmiller,ou=People,ou=password tests,o=Pwd Policy Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_BASE64.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_BASE64.ldif
index dc56c20..584e88b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_BASE64.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_BASE64.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_many_schemes.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_many_schemes.ldif
index befcce3..b3c8fbe 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_many_schemes.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_add_many_schemes.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif
index dc8243e..33c67ea 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BAD.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif
index 15f2819..4d3f7ec 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_BASE64.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif
index 5382219..aa21a45 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_CLEAR.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif
index bec4bd0..b9f5c69 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_MD5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif
index 34b5d54..85436c7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SHA.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif
index 1aa8639..d2f6c3a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SMD5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif
index ed7661e..fc504aa 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA256.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif
index b1684c5..1862aad 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA384.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif
index 16e5206..338342a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_change_SSHA512.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif
index 5b716a4..087829c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_delete_MD5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif
index 1844d86..b4dc5ce 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_depr_MD5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif
index 455fc42..7379481 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/admin_reset_SSHA.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
index 5d06a17..0cd52be 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=Pwd Storage Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif
index 7b75abe..b101b53 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_add_pwd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bhall,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif
index c035538..41a3f02 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_BASE64.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jwallace,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif
index 7afe7d9..ccdb879 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_CLEAR.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jwalker,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif
index 8904f95..397f39b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_MD5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kwinters,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif
index 2bc3ccc..8943b8b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SHA.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif
index 9d144a7..4a494f2 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SMD5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif
index 1fa4df6..91e349b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif
index 8ef19e0..8508552 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA256.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif
index e87f9be..09ee355 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA384.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=dmiller,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif
index bf134ac..0c78ca9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_SSHA512.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=gfarmer,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif
index d6457c7..27a3d46 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_depr_schemes.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmason,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif
index e378a11..324e830 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_storage/user_change_pwd_mult_schemes.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bhall,ou=People,ou=password tests,o=Pwd Storage Tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif
index 10af4aa..5a08a2c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_max_pwd_length.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif
index 2fd5a2e..0903782 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_change_min_pwd_length.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif
index 9ffe59d..60f93fa 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_bypass_pwd_validator.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif
index 517de94..9a4b768 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_disable_pwd_length_validator.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif
index 7c6fad3..c3a4d1f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_bypass_pwd_validator.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif
index 0037af1..539f4e5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_enable_pwd_length_validator.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Default Password Policy,cn=Password Policies,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif
index 403f900..eb4c585 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_max_pwd_length.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif
index 3e24150..36f8a4e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/admin_reset_min_pwd_length.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif
index 8be2a27..bcf83f8 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/delete_sales_admin.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Admin,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
index 3ef1ae2..49636fc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=Pwd Validator Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif
index 9b8791d..46d24be 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Admin,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif
index 4776424..2e20f47 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Admin,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif
index e852615..31bd03c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/root_change_pwd_too_short3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Sales Admin,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif
index d1fa3a2..e067d75 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bhall, ou=People, ou=password tests,  o=Pwd Validator Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif
index 97ae09b..a6709fc 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_long2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bhall, ou=People, ou=password tests,  o=Pwd Validator Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif
index 9e8bb0f..81120d9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bhall, ou=People, ou=password tests,  o=Pwd Validator Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif
index 4d0480b..e3129f7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/pwd_validator/user_change_pwd_too_short2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bhall, ou=People, ou=password tests,  o=Pwd Validator Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm.ldif
index 3a0e42f..94b46b6 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm2.ldif
index 81eae5c..c622516 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_add_realm2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_CLEAR.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_CLEAR.ldif
index 14d69f9..a04a271 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_CLEAR.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_CLEAR.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_SSHA.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_SSHA.ldif
index 2b7f764..ceeb24d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_SSHA.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_SSHA.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_authzid_attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_authzid_attr.ldif
index 8d8cd88..804ea4b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_authzid_attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_authzid_attr.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd.ldif
index 6413ee7..dc14b8d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd2.ldif
index e35033b..c5d49cd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd3.ldif
index d604603..0a4a62a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd3.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd4.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd4.ldif
index e9f80d5..9580e2e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd4.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd4.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd5.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd5.ldif
index 863e592..c2beffd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd5.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd5.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd6.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd6.ldif
index 63d4a3a..1ad90c9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd6.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_change_user_pwd6.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
index 7e4764d..63760cb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_disable_sasl_anon.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_disable_sasl_anon.ldif
index 1b99009..db82b85 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_disable_sasl_anon.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_disable_sasl_anon.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_enable_sasl_anon.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_enable_sasl_anon.ldif
index 19616da..f0a3777 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_enable_sasl_anon.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_enable_sasl_anon.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_reset_authzid_attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_reset_authzid_attr.ldif
index 3a192c3..5e2bc0e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_reset_authzid_attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/admin_reset_authzid_attr.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
index f63a5e4..d2236a2 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
index 32aa0d1..e6a3d84 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jwallace, ou=People, ou=startTLS tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
index b97ced1..7eeb5a5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=startTLS tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
index b119419..fdc3ce9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
index dde7d68..5240e21 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
index 519e20e..4e481ae 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
index da5c361..8308343 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
index 51a9529..25c438c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
index c31ddb3..3ba9906 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
index e0d5eba..bb7fbd5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
index 53246ae..fd8f422 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
index c7da87a..62e3c20 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
index 2409adc..cad393a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
index 6906fee..9085997 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
index 2bb0ed0..f22e04a 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
index de8795e..3694bd5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
index ea7f9b4..a50bdd7 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
index 7375aef..1ee1bdb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
index 54b588f..b69c64e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
index 50d3890..1af2625 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
index c4e272a..1d6ff73 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
index a3d87b2..4eada2c 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=alutz, ou=People, ou=startTLS Tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_key_mgr_provider.ldif
index 0ad3e6b..58a7beb 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_key_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif
index dd3f603..5ae2ef8 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_startTLS.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif
index 62222d4..901e9c6 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/setup/enable_trust_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
index cd4339c..df7ce6e 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_key_mgr_provider.ldif
index 78dc2ff..8e538bd 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_key_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_startTLS.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_startTLS.ldif
index 1f9e61a..8c9c234 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_startTLS.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_startTLS.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_trust_mgr_provider.ldif
index 0500c7f..3028672 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/functional-tests/shared/data/security/startTLS/teardown/disable_trust_mgr_provider.ldif
@@ -15,7 +15,7 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index 4876b78..1b0f1a7 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
index 9704df3..7f26b8e 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
index 7a395e7..052a4d7 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml
index a49f5e5..7d78564 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml
index aed78b2..0dd7fce 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ArrayData.java b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ArrayData.java
index a07e2ff..d7421b5 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ArrayData.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ArrayData.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
index c881405..1898aaa 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java
index 0c7a767..45b8efa 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/ParseData.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/README b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/README
index f87cae7..8026e5d 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/README
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/README
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/TestFileList.java b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/TestFileList.java
index a3162cb..7c7bb06 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/TestFileList.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/TestFileList.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_int.java b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_int.java
index dc24e99..f6f64a6 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_int.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_int.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_xml.java b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_xml.java
index d176bf9..db1b06b 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_xml.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/parsingtool/WriteXMLFile_xml.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/java/xmlToHtml/xmlToHtml.java b/opendj-sdk/opends/tests/functional-tests/shared/java/xmlToHtml/xmlToHtml.java
index d64f674..3325f1f 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/java/xmlToHtml/xmlToHtml.java
+++ b/opendj-sdk/opends/tests/functional-tests/shared/java/xmlToHtml/xmlToHtml.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 import javax.xml.transform.*;
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml b/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml
index 6179f40..d91d8c3 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml
@@ -19,7 +19,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml b/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml
index 43a5a23..185c2d9 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml
@@ -19,7 +19,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
index 2a59bcf..4b85ffc 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
@@ -16,7 +16,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
index 504a284..0022773 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
index d953933..8f3dd73 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_setup.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 85aa653..9fed154 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml
index 45cdab1..4f5a04b 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backends.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
index 86aab83..a0f9157 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
index f2e9675..bc92071 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
index c5e4a95..cf101c9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
index 8099293..46169a9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
index 921dcce..caec888 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 174a468..dfc756d 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
index 4e22a6b..623fae2 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
index bb6192f..297797c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
index f96813a..0b69e12 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
@@ -18,7 +18,7 @@
  ! file and exclude 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
index d8061a2..a1a9365 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
index 8808554..ba13726 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
index b53d65d..07286e7 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index fdf6a08..17aecbb 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index 111d565..4f9176e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
index 81978d2..023df55 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
index 9bd73ac..5a522aa 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
index 0d51881..97bb83c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index 0a4cdb8..a13bddb 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
index 00e467c..9533139 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
index ffa0336..632cc85 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
index 040882f..e254a78 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index 03a140a..9b3212c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index efcd007..54ad9ce 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
index ebb9c2c..9698fd2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index e4e6cf7..d26777e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
index cac41e4..d8df1ec 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
index c904571..d07bbb5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index c43c5c8..428e39f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
index 3308072..e4f1cc1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
index d42d8dd..c3a9a01 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
index 68a8d2e..821ed30 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
index 60fd757..55043c9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
index 926dcd1..fe04af1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
index 8eff580..6dbda72 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
index bae9ef0..a30bd93 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
index d1b1669..59ffa65 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
index d9a7990..a6544b9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
index 3bb89cc..e1bce8e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index 4a0a255..6c75e4c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
index ba71097..f48cd84 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
index 1fb6d4a..c7ba996 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index 823fb66..55e54b9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
index b809964..5a81e80 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index 01e81c6..0388fc3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index a8e4611..a037d41 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 84ef6de..58a45d4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
index c25a5b1..8c594ae 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index f1cffd9..fc73038 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index 37082fa..b5889cb 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
index 731ab18..1be50ca 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
index 3f50bc0..36fdeb8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
index bb7d103..f16dc54 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
index 0880ccd..8c872b0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
index f924639..0ad3ba1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
index 6aa1c26..746496b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
index eb47f01..d7b643f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
index 340d581..38b0214 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index 8f23334..138717a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index 4a1e212..7f17e47 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
index 50e6d2f..5b2708b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
index dbb264e..0c54ccc 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
index a2aab70..fd394f2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
index e62f209..e143c2d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
index 6f55084..6df4d93 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
index de199b1..c802572 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index 3cd495f..ba8de21 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index 7425f6d..c0cc6e4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 888f51d..5e98480 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index 49827e4..978d98f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 26905e2..7b6a17b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index 0a8c836..5026a63 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index ea3a617..fef1d3e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index fc2956e..22924b1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 1e1ed83..a70695e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index babeca2..6897513 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index 8e88e7e..8e137dc 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
index d64f9d5..6622b9c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
index 1ff42c0..1f02163 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
index 08e2c08..a044aaf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
index 12a6540..859fdd1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
index f4494e5..2d8c6fc 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
index be7a565..ef9e396 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index 942fd0b..ec81aed 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
index 099222d..5a68ec3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
index cddfa78..9fccfe8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index 8c97e70..a69874b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index 9550d4d..b36f887 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 917eb0c..a41a404 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
index 585769e..e30ac16 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
index e404647..b03540e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
index f6a2fda..f529102 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml
index 5274201..6ca0cf2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/security.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index fe4640f..648cb8a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
index 56bab42..52663b3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index b562248..50e45b0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
index 641c27f..7596c45 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 3e95465..dcd435f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
index fd5f99a..1c83ce6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
@@ -18,7 +18,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/installer.xml b/opendj-sdk/opends/tests/installer.xml
index 2efb971..189b6ae 100644
--- a/opendj-sdk/opends/tests/installer.xml
+++ b/opendj-sdk/opends/tests/installer.xml
@@ -16,13 +16,13 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
  !
  !
- !      Portions Copyright 2006 Sun Microsystems, Inc.
+ !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 
 <project name="opends-tests-installer" basedir="." default="usage">
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/README b/opendj-sdk/opends/tests/integration-tests-testng/README
index 83db1f8..e00e544 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/README
+++ b/opendj-sdk/opends/tests/integration-tests-testng/README
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 The Integration Test Suite is designed to provide a level of testing
 above that provided by standard unit tests. It is principally designed
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/build.xml b/opendj-sdk/opends/tests/integration-tests-testng/build.xml
index f4df91c..2421d06 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/build.xml
+++ b/opendj-sdk/opends/tests/integration-tests-testng/build.xml
@@ -16,7 +16,7 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
index 644b429..8246900 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSMgr.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSMgr.java
index 7b57d87..4f8012a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSMgr.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSMgr.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestListener.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestListener.java
index 5e905b1..63ab977 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestListener.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestListener.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestOutput.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestOutput.java
index 8c72054..8b951cc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestOutput.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSTestOutput.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
index 0cf7b20..f793501 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java
index 22b49e6..8a79eb3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java
index d338c86..3a3b643 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTasksTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java
index f1dbcee..6c1007d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
index 1cf2210..8a1c700 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
index 9edde53..bb9d210 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
index 0515dff..a2723f9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
index 73f5173..711b88f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
index 877cf6b..deda6e8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
index b23b6e6..788fef6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.backend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif
index bf5e17a..406790b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=backend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif
index 2035911..be247ac 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=branch test seven, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01
index 45a25e6..76f998c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02
index 0c8bfbe..92cd555 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=test two, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03
index b12c9cd..6b3918e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden3, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04
index 382ff81..9797770 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden4, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05
index 8f6dc58..2fd1cb2 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden5, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06
index 379634e..bd274e6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden6, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07
index 64826f2..5a82603 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden7, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08
index c150702..6c0d8e9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden8, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09
index 2b7d293..3d42fce 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden9, ou=People, o=test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10
index e45f34e..ebde430 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=branch test one, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11
index fc36e54..0b2cd8b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=branch test three, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12
index c11e0da..581ed93 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=branch test five, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13 b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13
index 5c9dd81..35e7feb 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=branch test seven, o=import tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
index 4dbdcfe..4437552 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=import tasks tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif
index 22fed26..febe090 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris,ou=People,o=backend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif
index 84f8519..c2d0d9d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris,ou=People,o=backend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java
index 11ed5d7..066860a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.bob;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java
index 4e85873..b98142c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.bob;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java
index b2116a8..47d54f4 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.bob;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java
index 6817e4a..51b43bc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.bob;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java
index 5a57af6..fe7ef7e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.bob;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobTests.java
index dbd3844..6967de1 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.bob;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif
index 31f8fc0..601ec89 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif
index dd2dfeb..b0ea17f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif
index 7e7624b..3a4c46c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, c=Canada, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif
index 287b5bb..31df5a6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif
index 63a6a72..5042383 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif
index a881ce1..c51d642 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif
index ff9554f..af918b0 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bscharp, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif
index 86c25cb..5c1c1f3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bsmith, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif
index d181965..74d01a3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bscharp, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif
index 101efe3..bc02bdf 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bsmith, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif
index c8fff24..9e8f2f7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif
index 1bb3833..8641ec8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif
index 0383af6..e4840e6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif
index 9e4a7a3..34f1b9c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif
index c932ca2..e40a1e3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo1, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif
index 879c7ad..e3b9e0d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo6, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif
index cf79e93..124e248 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo1, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif
index f0d91c0..877aef9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo6e, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif
index 1314373..560d879 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=rdaugherty, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif
index fb0cf58..9f3e950 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif
index d58fb1c..c51962a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo11, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif
index ff4c652..aed1f59 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo12, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif
index 928831d..e963a5a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmason, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif
index 1e94d44..395fed8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jmcFarla, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif
index 2edd319..e7ef256 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo13, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif
index 3eb5cba..0a1e8e7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo18, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif
index 022bbf2..608177a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif
index 1a4112b..7c599e5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=achassin, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif
index 6c478ea..8385441 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif
index b2603bf..9400511 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif
index 7335460..dbdcfb6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo23, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif
index f3b26f7..7e70ce3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo24, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif
index 439cf9d..f4931a3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo23, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif
index 8960d04..0ad5dd3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo23, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif
index 3c28119..bc7748e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif
index 80d4b53..3ba713e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=striplet, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif
index 5e17279..a1cb7ca 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif
index c3ff234..12ece4c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif
index 8177111..84c8854 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo25, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif
index bd8e281..2231b4e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo30, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif
index b9b95e7..81b02c2 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo25, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif
index af7983d..9362ab6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo30e, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif
index f823de4..3c0be3f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bschneid, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif
index 4ac9e86..87c05de 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=skellehe, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif
index fd69aed..9bf6357 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo47, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif
index 35686aa..c26932c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo48, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif
index e1cef65..66b1338 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=brentz, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif
index df03733..1b29af3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=lcampbel, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif
index 4cb1488..f0ef965 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo49, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif
index 431066a..736cafc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo54, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif
index 90ecd42..436872f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jfalena, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif
index 848bb58..16d1125 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=speterso, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif
index 846a750..f4b5a3a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo35, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif
index 5e2ec2d..472f128 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo36, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif
index d8e707b..081e025 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=ejohnson, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif
index b921dd2..44be589 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=cwallace, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif
index 9a9c5c3..e9e936b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo37, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif
index 8396d51..a73c2ea 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=foo42, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif
index fbf6c6f..cd08ffd 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif
index f58696c..b709182 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bad, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif
index a04a2e5..5142608 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=pshelton,ou=People,o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif
index e966c78..45a07e3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmason, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif
index 884c5f9..ec5b27b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 uid=jreuter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif
index 41422b7..4d6f44d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif
index 555be37..c4675c2 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif
index 1c1d602..0a4939a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif
index 8568685..9f5f960 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif
index 7906897..685c0ad 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif
index 365ad6a..8e7d2b6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif
index 3bf7205..24c7ca6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif
index 2a38da6..9024728 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif
index 9472606..52f8703 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=rdaugherty, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif
index f55d3ba..6c13079 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif
index 216f7f1..498abbc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmason, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif
index d24ec42..4f54fab 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jmcFarla, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif
index 2aa7b5f..f44add3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif
index 9399d4e..f7e89e8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=achassin, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif
index 679361e..6ab23e8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif
index 8150986..9a21bf6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=achassin, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif
index 80e8e55..a637c36 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif
index 526a0c4..5d9bfac 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=gtriplet, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif
index 55d250d..ac82231 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif
index 3011f1c..a5125ff 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif
index 201b0f3..8e96714 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bschneid, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif
index 6f25b3a..eca9bbc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=skellehe, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif
index 4cba7ea..a656139 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=brentz, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif
index d983a12..ce96cda 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=lcampbel, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif
index 60d4f2b..cc74e25 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jfalena, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif
index 0ed39df..62eb1fe 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=speterso, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif
index 070630f..bf2004b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=ejohnson, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif
index 3aba595..9f0edc5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=cwallace, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif
index 2d2b34c..04fd909 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:uid=prose, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif
index f34c763..655a716 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:uid=prose, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif
index ee13dbd..58378e7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:uid=jhunter, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif
index 0da79d6..1efc022 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=ashelton, ou=people, o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif
index 9a933e8..0efb6db 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=bob tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java
index 08234ae..1cf0aa3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java
index 1b0ccc0..03f7b64 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
index 8280541..fda5e45 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
index ec2203a..8ca03e5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java
index 9d69e4e..c92f748 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java
index 3534327..b003fcd 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
index 122c29d..1dd4a43 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.core;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif
index feec938..58de636 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=core tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif
index c6fd259..dedb07f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=North America,o=core tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif
index d099c6c..cdc55da 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif
index f84a3eb..d46b109 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif
index 3bd1f39..d6713f5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif
index a54d9d6..b197983 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Entry Cache 2,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif
index b357e2a..f15b0da 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif
index 8be234e..2e56dd7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif
index 1c72d82..9c0f120 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif
index 77e9578..82d9fa0 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif
index b9513d8..2ca94bf 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif
index eeadc35..60286fd 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif
index a881375..10e380d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif
index 7674a81..7c9e673 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Directory Manager,cn=Root DNs,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java
index 18969ab..abbb7b4 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java
index 687497a..1acede8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java
index 4d2f67e..0bdd2ee 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java
index 08f27ed..adb3606 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java
index 4c291e4..40ff72f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java
index 4e56cdc..dd9e6a3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_searches.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java
index c359a61..5eee1fe 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_standards.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java
index c563530..8e75728 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2252_syntax.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java
index bb2f0a9..f4c2e94 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2253_relationships.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
index 898e3ee..eac96db 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java
index c6101b7..03e7435 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.frontend;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif
index 457c2d1..45bd478 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif
index f2ddb84..173fda8 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter,ou=People,o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif
index 97c80eb..79d4b4e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=tmorris, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif
index 939c0ae..0f58a4f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif
index 902ef00..93a89d5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kvaughan, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif
index 9bc2f6c..6e88624 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=abergin, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif
index 6766f69..bdc18c7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=dmiller, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif
index 00a3fc6..bea90f1 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=dmiller, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif
index 64e8c9a..7a6bd0c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=gfarmer, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif
index 0def0d0..9366f44 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=kwinters, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif
index b38f3af..1a62c04 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=badname, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif
index ebac665..1414e03 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=trigden, ou=People, o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif
index 79dd6a8..fc322b2 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter,ou=People,o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif
index 0aa9b0d..4b104ad 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jreuter,ou=People,o=frontend tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java
index eaac2ce..68dfbb7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.quickstart;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartTests.java
index d36f5e9..13d18c6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.quickstart;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif
index 5f366ab..378f295 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java
index 1d9650f..f849dcc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.schema;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
index bc20117..8f3a0a6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.schema;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaTests.java
index b37ce08..0953c92 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.schema;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif
index dfce7ba..19fe4b9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: changenumber=100001,o=changelog tests,dc=example,dc=com 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif
index 938243c..03f7eb7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: changenumber=100002,o=changelog tests,dc=example,dc=com 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif
index 170c007..2e11ecb 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: changenumber=100003,o=changelog tests,dc=example,dc=com 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif
index b03ed0f..83086e3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif
index c029349..c241fc1 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Generalized Time,cn=Syntaxes,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif
index 74a0bd8..51e7ecc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif
index 96550f3..c026a0c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Generalized Time,cn=Syntaxes,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif
index a58213d..8f1f087 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: documentIdentifier=ldap cosine 1,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif
index e9a7913..f918b5b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=new author,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif
index b54d79b..c0160da 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=another new author,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif
index 9fec20a..d520235 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=ldup subentry 1,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif
index 29fde86..fa31399 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=ldup subentry 2,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif
index 4643676..e2aec94 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=ldup subentry 3,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif
index ce0bd0f..70d16bc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=named object,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif
index db22ba8..6dcbedb 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=named object 2,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif
index b86cf6d..51f81be 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=mmiller, ou=People, o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif
index 029a630..111674e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif
index 3360413..73e3b1f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-2,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif
index e66ec79..396546c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-3,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif
index 3e2f35c..8cae9e4 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-4,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif
index 8b4b61e..75e87ac 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2247-tests-5,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif
index b49ec62..07fe045 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=server 101,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif
index 070b6c8..4dff54e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=server 102,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif
index 770db22..a88a55e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=printer 103,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif
index 4ca9d56..04711c5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=printer 104,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif
index 4503870..866ec28 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: dc=rfc-2377-tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif
index cf7065c..3c724e3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bmorris, ou=People, o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif
index b029593..13e04c9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif
index e7ec6bd..1b18a1c 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif
index 18e053c..554a608 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif
index adbd30a..a0c93bc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiServiceKey=ldap service,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif
index a016495..9caf62e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiServiceKey=bad service dn,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif
index 03b06e1..01cb3e3 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=4001,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif
index 98c78ac..b8c7abd 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=5001,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif
index 1b00779..d043303 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=6001,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif
index 98399cc..0fea57d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uddiUUID=7001,ou=uddi tests,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif
index d31c4bc..8b38cfc 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: o=extensible object tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif
index 0ef29b9..46df9a9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=untyped object,o=rfc tests,dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java
index f14a129..7db6d9e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSBobTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.security;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
index 30f2886..d6fe90a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.security;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java
index 19c0806..6117f51 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTLSTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.security;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java
index 2468210..27644ad 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.integration.security;
 
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_in.ldif
index 38c931b..aaa16bd 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_tls_in.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_tls_in.ldif
index 427d5f6..dd6feb5 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_tls_in.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/add/bin_a1_tls_in.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=jwallace, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_out.ldif
index a3029dc..8b9662a 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=bparker, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_tls_out.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_tls_out.ldif
index 14fece8..0c7653d 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_tls_out.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/del/bin_a1_tls_out.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/jks_startup.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/jks_startup.ldif
index 522636a..c97ad47 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/jks_startup.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/jks_startup.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:  o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_mod.ldif
index d1e3912..15ddbcf 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_tls_mod.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_tls_mod.ldif
index ccc58fa..dc0e99b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_tls_mod.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/mod/bin_a1_tls_mod.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: uid=alutz, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/modrdn/a1_modrdn.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/modrdn/a1_modrdn.ldif
index 0b1a819..1fd18ea 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/modrdn/a1_modrdn.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/modrdn/a1_modrdn.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn:uid=prose, ou=people, ou=jks tests, o=SSL Tests, dc=example,dc=com
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/shutdown/disable_TLS.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/shutdown/disable_TLS.ldif
index 49f7a5d..8c9c234 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/shutdown/disable_TLS.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/shutdown/disable_TLS.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/deleteTrustMgr.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/deleteTrustMgr.ldif
index 964e668..fc79f04 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/deleteTrustMgr.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/deleteTrustMgr.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Trust Manager Provider,cn=SSL,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_TLS.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_TLS.ldif
index cc38888..5864274 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_TLS.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_TLS.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_key_mgr_provider.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_key_mgr_provider.ldif
index 69eb78e..75fc19b 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_key_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_key_mgr_provider.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Key Manager Provider,cn=SSL,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_ldaps_conn_handler.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_ldaps_conn_handler.ldif
index 5987d8e..96e53e7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_ldaps_conn_handler.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_ldaps_conn_handler.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_trust_mgr_provider.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_trust_mgr_provider.ldif
index 65c043f..ef23d01 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_trust_mgr_provider.ldif
+++ b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/data/startup/enable_trust_mgr_provider.ldif
@@ -15,12 +15,12 @@
 # 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:
+# by brackets "[]" replaced with your own identifying information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
-#      Portions Copyright 2006 Sun Microsystems, Inc.
+#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 #
 
 dn: cn=Trust Manager Provider,cn=SSL,cn=config
diff --git a/opendj-sdk/opends/tests/oulu-tests/build.xml b/opendj-sdk/opends/tests/oulu-tests/build.xml
index 475a176..a044a48 100644
--- a/opendj-sdk/opends/tests/oulu-tests/build.xml
+++ b/opendj-sdk/opends/tests/oulu-tests/build.xml
@@ -16,13 +16,13 @@
  ! 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:
+ ! by brackets "[]" replaced with your own identifying information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
  !
  !
- !      Portions Copyright 2006 Sun Microsystems, Inc.
+ !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 
 <project name="opends-tests-oulu" basedir="." default="usage">
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
index 0d4f3b7..b5dfc96 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
index b3f0a70..f348970 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestAccessLogger.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestAccessLogger.java
index 7906ada..091575e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestAccessLogger.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestAccessLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index bc13cfa..c2b72ab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestErrorLogger.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestErrorLogger.java
index 8a01e65..7be5bc6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestErrorLogger.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestErrorLogger.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
index be7bd51..ee14f82 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
index d8bc66e..5343343 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
index 5dd0289..ad7d046 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigurableComponentTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigurableComponentTestCase.java
index 0aceb29..0773417 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigurableComponentTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigurableComponentTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
index 8d30918..2fbd1f3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
index 8b05cf8..8a95a9a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResultTestCase.java
index f79b485..3523689 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/LDIFPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/LDIFPluginResultTestCase.java
index 43217a7..c2aad9d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/LDIFPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/LDIFPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
index 80d3e26..f426400 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostConnectPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostConnectPluginResultTestCase.java
index 3b40318..13d2e65 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostConnectPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostConnectPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostDisconnectPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostDisconnectPluginResultTestCase.java
index ed526c4..699f57a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostDisconnectPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostDisconnectPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostOperationPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostOperationPluginResultTestCase.java
index 746ef21..e0dfc9d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostOperationPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostOperationPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostResponsePluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostResponsePluginResultTestCase.java
index 8a633b8..fa32608 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostResponsePluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PostResponsePluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreOperationPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreOperationPluginResultTestCase.java
index a3ab71e..1c7e80c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreOperationPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreOperationPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreParsePluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreParsePluginResultTestCase.java
index 2eb0c5c..b2bff5a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreParsePluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PreParsePluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchEntryPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchEntryPluginResultTestCase.java
index da968d1..4fc9e8e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchEntryPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchEntryPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchReferencePluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchReferencePluginResultTestCase.java
index 6a983a6..fefcecd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchReferencePluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/SearchReferencePluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/StartupPluginResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/StartupPluginResultTestCase.java
index 2813c49..42a3153 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/StartupPluginResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/StartupPluginResultTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.api.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
index db960a8..e8d6958 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
index 327f568..931ecba 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.backends;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
index 3712098..4b84935 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index cdf2f90..922e5c5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index 16a3da6..e235814 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
index 97ca98d..c80e9de 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 8549eb3..9def18f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
index 93fd149..d3b8f52 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
index 73cd024..a19e3a0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
index ca573f6..b6af139 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
index 430a948..73cdee3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
index 08461b6..58940c0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
@@ -742,4 +742,4 @@
     			new LinkedHashMap<AttributeType, List<Attribute>>(0),
     			new HashMap<AttributeType, List<Attribute>>(0));
     }
-}
\ No newline at end of file
+}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
index dfba42c..ac1f96f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.controls;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
index 6a3eedd..db62f92 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.controls;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
index 2b4a965..08a589a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.controls;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
index 840650a..c78c1f6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.controls;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
index 3515430..d6ea36b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
index 72b044f..13b6e9b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
index 93c36f7..100af3f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
index 12acf73..016230c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
index 66e4204..73fbf9c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index bfbbfeb..2ea76ab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
index ea58f90..2c1ca29 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
index f88cd6c..b98011f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
index ca250b6..52a6b7e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
index d9149a2..5df00df 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index 5010c5c..36ee1d9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
index ffea9fb..23a3fc1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
index 4872d19..548c320 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
index d7d09fd..b765501 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index abfd9bc..17b3825 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.core;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
index 5541c30..fbc5ae2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.core;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestAbsoluteSubtreeSpecification.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestAbsoluteSubtreeSpecification.java
index 4829bba..0267eb1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestAbsoluteSubtreeSpecification.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestAbsoluteSubtreeSpecification.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
index 47e92e7..e668c7e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index 819da8b..8873dc4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRFC3672SubtreeSpecification.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRFC3672SubtreeSpecification.java
index 3ac81cb..0882925 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRFC3672SubtreeSpecification.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRFC3672SubtreeSpecification.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRelativeSubtreeSpecification.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRelativeSubtreeSpecification.java
index a6290b3..1301fcd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRelativeSubtreeSpecification.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestRelativeSubtreeSpecification.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
index d0a79ac..1a62dd3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
index 6181470..d6543d2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
index f835d5a..7891fae 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
index 0869ffc..a732c8b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
index 137cc07..2bb3d67 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index 5e205ed..1a2209e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
index 38de43b..b44d868 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
index 03e63be..8058e5b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index f4c80d5..ef4e54d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
index 2693a70..d60d803 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
index 56fd41a..c1774d4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 05df703..9c54126 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
index 9e76a36..0572f5d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index 87764be..e1b81f7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
index ebbbc14..89bf70c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
index caf023e..58fe8a4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index 9f512fe..9716e15 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/InternalConnectionSecurityProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/InternalConnectionSecurityProviderTestCase.java
index e8fc7ba..32785c8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/InternalConnectionSecurityProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/InternalConnectionSecurityProviderTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
index 5e7a20a..a26601e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
index 614bc88..494b917 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
index 9023921..6ab7ff7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullConnectionSecurityProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullConnectionSecurityProviderTestCase.java
index 6148b14..ff72e9f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullConnectionSecurityProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullConnectionSecurityProviderTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
index 3dcf3e0..2a35174 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
index a32a1ff..fc32636 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index 9079590..65de147 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index ab3ce55..22de6cf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
index eedbede..3cf7ea7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
index 598dc9a..498fc70 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
index 7a373a7..3737c2d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
index 0d8509d..b27b56b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
index 442c538..b5be590 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
index 70c45d2..beea4f2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
index f168983..dc15470 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
index 2093d4c..30ae73c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
index d369d1d..6468319 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index 5e28262..89f1ea3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index f682cc3..627c53a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
index 2fb0f4c..269cd71 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
index a4af91a..cae68f8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
index fbf5ac8..64fab27 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
index 58c7c1f..0b671ee 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/InteropTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/InteropTestCase.java
index a39a01e..36793d3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/InteropTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/InteropTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/LazyDNTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/LazyDNTestCase.java
index 02a3437..b739017 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/LazyDNTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/interop/LazyDNTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/DuplicateMessageIDsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/DuplicateMessageIDsTestCase.java
index fb6afc0..8e50bed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/DuplicateMessageIDsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/DuplicateMessageIDsTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.messages;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessagesTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessagesTestCase.java
index 9513ff7..87c287d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessagesTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/MessagesTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.messages;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/UnregisteredMessageIDsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/UnregisteredMessageIDsTestCase.java
index da93fbf..3c7b284 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/UnregisteredMessageIDsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/messages/UnregisteredMessageIDsTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.messages;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
index cd78794..0b70007 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
index 98c8538..693921f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index d2ca0fb..295b7d5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
index a2c4499..a2085da 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
index 7e479c6..56bea6a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
index dbdfe29..6d1ac74 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
index d0db760..febb7bb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.monitors;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
index da40209..b3b7737 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
index 1cd999f..8ccf8a2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.monitors;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
index 197057c..062595c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
index 641de1e..8306c0b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 0f25c24..ab1eea4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
index 04e3187..a4aaef6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
index 6c9bdfa..2ffdfb4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
index 7bee751..deee058 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
index 0db230b..0383526 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
index 212d3ca..399d7fc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
index d4d1383..2d99cb1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
index 77ac82f..c7374ab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
index c0801ee..2f85fd8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.plugins;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1TestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1TestCase.java
index 372c002..4928dbf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1TestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1TestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketReadThread.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketReadThread.java
index cf7fdfc..022ee4b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketReadThread.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketReadThread.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketWriteThread.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketWriteThread.java
index f63696e..b68ed08 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketWriteThread.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/SocketWriteThread.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java
index 85d94bc..b55b237 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java
index 0f7e105..b26787a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java
index 7cebd81..80b7378 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java
index c27033e..6aa55b4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java
index 453e990..c860952 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java
index 625ce11..033f9b2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Null.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Null.java
index fc88227..321f7c3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Null.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Null.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java
index 52d6e5c..c51731e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java
index fa38210..7b4ad93 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java
index a5471df..20d6d1d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java
index 147e410..475add9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.asn1;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
index c0a2e82..4194343 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
index f552f50..8d63331 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.internal;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
index 8464003..a5e8944 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.internal;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
index 6e5f16a..73b86b0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.internal;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
index 44e3004..1334f17 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.internal;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
index 53cb488..442271e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
index 90b1290..64fb61f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.jmx;
 
@@ -34,4 +34,4 @@
  */
 @Test(groups = { "precommit", "jmx" })
 public abstract class JmxTestCase extends DirectoryServerTestCase
-{}
\ No newline at end of file
+{}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java
index 860dd60..cf384be 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.jmx;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
index 69b9ba8..3b4f0d8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap ;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
index ce39876..720a531 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
index cbbb97c..9c5ed4c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index 77403da..e39e475 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
index dbdeca8..6d5e860 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
index b54043c..d8bb2f8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
index 8965aa5..f8d8093 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index 00bbc83..009d484 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
index 2b1e62c..4765324 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index d02563d..ec9579f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
index c43ef30..72dcd35 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.protocols.ldap;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
index 17f6a0c..463030b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.protocols.ldap;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
index 550f5ee..08d07eb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
index 3a3d8b5..2f6e5b8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 377f716..f00bab1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
index 8c6c397..4e6bcca 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index 2c72c33..1907a85 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
index 8ff7d89..3ff79e1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
index a2635e6..4047708 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
index 76bd3f4..46dba59 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.protocols.ldap;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
index e10ebd1..cb609b7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
index 0651abf..fab9520 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
index e16e479..8de781a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
index 0a472c1..8410ff9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java
index dfc562c..c1b992c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
index dcfb0ab..907087d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
index e944e89..dc7e4c7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java
index e53b060..8447593 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java
index 8054e9d..adc0773 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
index cb7a933..15596fe 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java
index d18badc..7db4385 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
index 83b3748..7335756 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java
index b527d9f..8bd3dd2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
index 4457180..a7e3859 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
index eaa5647..7ea4449 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java
index ee37621..f50d2a5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
index 63a0618..7a8f664 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
index 6470a64..dce1845 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
index 81254a4..b2c7b8f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java
index ac02257..aa0733e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
index d888fb4..fc57ba6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
index 7b0d1bc..e94a7f6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
index 0abe9ee..1a6acc3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java
index 0e72d91..201f56f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java
index 433ab3a..e99d7e4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
index fb88ade..44a16ef 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
index 56cc684..0637cdb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
index a2fec65..83b35a6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
index 244cc5d..82747ea 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java
index 136bc4a..ef5bc1d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
index 2024535..2250897 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
index 0bab4a2..5c814fd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
index e1053a6..6e2a858 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java
index 651f512..8ad6482 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java
index 46517bd..8893c27 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
index 3008d05..94eea76 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
index 9d3c926..c8cc875 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
index b30d1f0..45b9427 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java
index 60f8710..67f6779 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java
index 97195b5..8d25241 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
index a086e7f..707cdd4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
index c9adeab..92be8cd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
index e470520..5c69019 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
index e8aafe3..ef0c099 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java
index 516fbc4..139b931 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
index 6c7f34b..a4966d9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
index 9147e17..bff4bfa 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
index aa2c7c4..b2e0ebd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
index 5bf657f..61e81ed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java
index e7a2c2b..37ff0af 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.schema;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java
index 5c399b6..bc39d1a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/ProtocolWindowTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
index 6215ca6..f3c20b5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SchemaSynchronizationTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
index 1228864..2c4075d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/StressTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java
index 3d69c5c..6f23faa 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/SynchronizationTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java
index c80b565..f595b4d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/UpdateOperationTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java
index 38e81f2..60877b6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/ChangelogTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java
index b30a574..a20696c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/UpdateComparatorTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java
index 5590012..5c13f9a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/changelog/dbHandlerTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.changelog;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
index dea7719..805c14d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberGeneratorTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java
index 57da6ac..79a162b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ChangeNumberTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.common;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java
index d514805..aac3b78 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/common/ServerStateTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.common;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java
index e5542af..7f9f722 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/AttrInfoTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java
index 3a1c112..08ad95f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/HistoricalTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java
index fd3ea0d..8e71dc3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java
index cbe6672..0437e4d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/PersistentStateTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java
index 9869e86..5b5a241 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ValueInfoTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.plugin;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SyncMessagesTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SyncMessagesTest.java
index d1b59c9..bdbc392 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SyncMessagesTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SyncMessagesTest.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.synchronization.protocol;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java
index 766355f..d59a5f0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/protocol/SynchronizationMsgTest.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index b957fa1..3f290e3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
index 3ee67c0..36cf39b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.tasks;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
index bf81863..1148909 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
index 0dba412..fdf02c0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
index f749c00..c3510d0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 
 package org.opends.server.tasks;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
index 0194e92..c70da58 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.tools;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
index a54b5f4..541ab6f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
index 2da6066..6e0927a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
index 23eb329..ef03934 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.tools;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
index b0b096b..67bbc81 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index aa9ba20..5a4bea7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.tools;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
index 9900bb8..a871dcc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
index 8c0f7d3..a5c9a3e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
index 54a056f..095dd61 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.tools;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
index fc48051..d4e1912 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.tools;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index d6cfd07..b9928ff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -16,12 +16,12 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  *      Portions Copyright 2006 Brighton Consulting, Inc.
  */
 package org.opends.server.tools.makeldif;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
index 2cef285..c534860 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
index 30ba356..05644a6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.types;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
index db6e5e1..aeefe0a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
index af9950d..d067a09 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.types;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index 5876712..9e1b04b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
index 1c1b251..9be7d62 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java
index 336f618..40ae20f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.types;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
index d78b714..be3dc7b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
index 6400d29..ac9b9a5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.types;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
index c05b75e..fefbb24 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
index 80be708..473db0e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
index 2a5390f..61c001c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
index 2df2dc9..218fc0d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
@@ -16,7 +16,7 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
index 7cab554..638e48b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.types ;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
index 01882ec..be942b9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
index 598c11d..ca7f478 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
index 2940f7c..af4de66 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
index 2ecb885..025760c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
index f2e2844..6de21ac 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
index 0a51093..eea765e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
index c7c4a0f..3ba5cd7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
index 3428a07..94a3746 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
index a6ee8a4..60ad4b8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
index 5cdfedc..d9300d7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java
index f4f1e0d..31cece7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java
@@ -16,13 +16,13 @@
  * 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:
+ * by brackets "[]" replaced with your own identifying information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
+ *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
 

--
Gitblit v1.10.0