From 2d2991e5746eacef47f32cfec5092597da247007 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Dec 2013 14:53:44 +0000
Subject: [PATCH] OPENDJ-1222 Global update of CDDL copyright headers

---
 opendj-admin/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java                                                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java                                                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefinitionDecodingException.java                                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/AdminClientException.java                                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectDNToUserAttributeCertificateMapperConfiguration.xml        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java                                     |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java                                         |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java                                                            |   13 
 opendj-admin/src/main/resources/stylesheets/ldapMOProfile.xsl                                                                            |   13 
 opendj-admin/src/main/java/org/opends/server/admin/Tag.java                                                                              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java                                               |   13 
 opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml          |   13 
 opendj-admin/src/main/java/org/opends/server/admin/Configuration.java                                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRotationPolicyConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogAccountStatusNotificationHandlerConfiguration.xml         |   13 
 opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java                                          |   13 
 opendj-admin/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java                                                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConfigFileHandlerBackendConfiguration.xml                         |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestChildConfiguration.xml                                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedDebugLogPublisherConfiguration.xml                       |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/DNBuilder.java                                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RequestFilteringQOSPolicyConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyOption.java                                                                   |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/string.xsl                                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDPluginConfiguration.xml                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalSASLMechanismHandlerConfiguration.xml                     |   13 
 opendj-admin/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueCharactersPasswordValidatorConfiguration.xml                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LengthBasedPasswordValidatorConfiguration.xml                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WhoAmIExtendedOperationHandlerConfiguration.xml                   |   13 
 pom.xml                                                                                                                                  |    1 
 opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java                                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogFilteringCriteriaConfiguration.xml                       |   13 
 opendj-admin/src/main/java/org/opends/server/admin/SizeUnit.java                                                                         |   13 
 opendj-admin/src/main/java/org/opends/server/types/DirectoryException.java                                                               |   13 
 opendj-admin/src/main/resources/com/forgerock/opendj/ldap/admin.properties                                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IsMemberOfVirtualAttributeConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedKeyManagerProviderConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyIsReadOnlyException.java                                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagementContext.java                                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReferentialIntegrityPluginConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/attribute-type.xsl                                                            |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DecodingException.java                                                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordExpirationTimeVirtualAttributeConfiguration.xml           |   11 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFConnectionHandlerConfiguration.xml                            |   13 
 opendj-admin/src/main/resources/stylesheets/java-utilities.xsl                                                                           |   26 
 opendj-admin/src/main/resources/stylesheets/property-types/aggregation.xsl                                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/OperationsException.java                                                              |   13 
 opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java                                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SoftReferenceEntryCacheConfiguration.xml                          |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CountryStringAttributeSyntaxConfiguration.xml                     |   11 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicySubentryVirtualAttributeConfiguration.xml           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowElementConfiguration.xml                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java                                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java                                                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/DurationUnitTest.java                                                                 |   13 
 opendj-admin/src/test/java/org/opends/server/admin/MockLDAPProfile.java                                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNUserConfiguration.xml                                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlowfishPasswordStorageSchemeConfiguration.xml                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ParallelWorkQueueConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SevenBitCleanPluginConfiguration.xml                              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/UnknownPropertyDefinitionException.java                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedTrustManagerProviderConfiguration.xml                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPConnectionHandlerConfiguration.xml                            |   13 
 opendj-admin/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java                                                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAuditLogPublisherConfiguration.xml                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java                                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java                                                        |   13 
 opendj-admin/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java                                              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/TopCfgDefn.java                                                                       |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/aci.xsl                                                                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgDefn.java                                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueAttributePluginConfiguration.xml                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FingerprintCertificateMapperConfiguration.xml                     |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/Conditions.java                                                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordGeneratorConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupConfiguration.xml                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SNMPConnectionHandlerConfiguration.xml                            |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java                                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FIFOEntryCacheConfiguration.xml                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogPublisherConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FixedTimeLogRotationPolicyConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogPublisherConfiguration.xml                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustManagerProviderConfiguration.xml                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginRootConfiguration.xml                                       |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/ip-address.xsl                                                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/doc/package-info.java                                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRotationPolicyConfiguration.xml                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/package-info.java                                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RandomPasswordGeneratorConfiguration.xml                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPConnectionHandlerConfiguration.xml                            |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ClassLoaderProvider.java                                                              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java                                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AuthenticationPolicyConfiguration.xml                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptPasswordStorageSchemeConfiguration.xml                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgClient.java                                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPAttributeDescriptionListPluginConfiguration.xml               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinition.java                                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/LDAPProfile.java                                                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java                                                          |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl                                             |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/ANDCondition.java                                                           |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/duration.xsl                                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/StringPropertyDefinition.java                                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TripleDESPasswordStorageSchemeConfiguration.xml                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/package-info.java                                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/NOTCondition.java                                                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CharacterSetPasswordValidatorConfiguration.xml                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectOption.java                                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginConfiguration.xml                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/AdminSecurityException.java                                                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPath.java                                                                |   13 
 opendj-admin/src/main/resources/stylesheets/serverMO.xsl                                                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DigestMD5SASLMechanismHandlerConfiguration.xml                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java                                       |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyProvider.java                                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationServerConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryUsageMonitorProviderConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedMD5PasswordStorageSchemeConfiguration.xml                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorException.java                                                         |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgDefn.java                                                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TelephoneNumberAttributeSyntaxConfiguration.xml                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DurationUnit.java                                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NullBackendConfiguration.xml                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationException.java                                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefaultManagedObject.java                                                             |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java                                                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java                                              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java                                             |   13 
 opendj-admin/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java                                                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestParentCfg.java                                                                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ManagementContext.java                                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualStaticGroupImplementationConfiguration.xml                 |   13 
 opendj-admin/src/main/java/org/opends/server/admin/SizePropertyDefinition.java                                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java                                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java                                                        |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/dn.xsl                                                                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/package-info.java                                                              |   13 
 opendj-admin/src/main/java/org/opends/server/config/ConfigEntry.java                                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PlainSASLMechanismHandlerConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java                                                     |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/size.xsl                                                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GoverningStructureRuleVirtualAttributeConfiguration.xml           |   13 
 opendj-admin/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DseeCompatAccessControlHandlerConfiguration.xml                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AlertHandlerConfiguration.xml                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateAttributeSyntaxConfiguration.xml                       |   11 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HasSubordinatesVirtualAttributeConfiguration.xml                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA512PasswordStorageSchemeConfiguration.xml                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetConnectionIdExtendedOperationHandlerConfiguration.xml          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GSSAPISASLMechanismHandlerConfiguration.xml                       |   13 
 opendj-admin/src/main/java/org/opends/server/types/IdentifiedException.java                                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordModifyExtendedOperationHandlerConfiguration.xml           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollationMatchingRuleConfiguration.xml                            |   13 
 opendj-admin/src/main/java/org/opends/server/types/InitializationException.java                                                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorBackendConfiguration.xml                                   |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/oid.xsl                                                                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java                                                    |   13 
 opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif                                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SynchronizationProviderConfiguration.xml                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPAccessLogPublisherConfiguration.xml                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JPEGAttributeSyntaxConfiguration.xml                              |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/enumeration.xsl                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNConfiguration.xml                                           |   13 
 opendj-admin/src/main/resources/stylesheets/messagesMO.xsl                                                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java                                                     |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/Condition.java                                                              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyImportPluginConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAlertHandlerConfiguration.xml                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBVLVIndexConfiguration.xml                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java                                                |   13 
 opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif                                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SambaPasswordPluginConfiguration.xml                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedHTTPAccessLogPublisherConfiguration.xml                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IdentityMapperConfiguration.xml                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CancelExtendedOperationHandlerConfiguration.xml                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java                                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GroupImplementationConfiguration.xml                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordStorageSchemeConfiguration.xml                            |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/ORCondition.java                                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorProviderConfiguration.xml                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/RelationOption.java                                                                   |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/ip-address-mask.xsl                                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyIsSingleValuedException.java                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/AciException.java                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java                                                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectEqualsDNCertificateMapperConfiguration.xml                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryDNVirtualAttributeConfiguration.xml                          |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java                                                          |   13 
 opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/Aci.java                                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java                                                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDVirtualAttributeConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueStringException.java                                              |   13 
 opendj-admin/src/test/java/org/opends/server/admin/AdminTestCase.java                                                                    |   13 
 opendj-admin/src/main/java/org/opends/server/types/LDAPException.java                                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationDomainConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeCleanupPluginConfiguration.xml                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PKCS11KeyManagerProviderConfiguration.xml                         |   13 
 opendj-admin/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXConnectionHandlerConfiguration.xml                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MD5PasswordStorageSchemeConfiguration.xml                         |   13 
 opendj-admin/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java                                                      |   13 
 opendj-admin/src/main/resources/stylesheets/preprocessor.xsl                                                                             |   16 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/api/ConfigAddListener.java                                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObject.java                                                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBIndexConfiguration.xml                                     |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java                                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java                                                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFBackendConfiguration.xml                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/RelationDefinition.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ProfilerPluginConfiguration.xml                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/Reference.java                                                                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileSystemEntryCacheConfiguration.xml                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeSyntaxConfiguration.xml                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRetentionPolicyConfiguration.xml                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtendedOperationHandlerConfiguration.xml                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RC4PasswordStorageSchemeConfiguration.xml                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DictionaryPasswordValidatorConfiguration.xml                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StructuralObjectClassVirtualAttributeConfiguration.xml            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ChangeNumberControlPluginConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileCountLogRetentionPolicyConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/package-info.java                                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml    |   13 
 opendj-admin/src/test/java/org/opends/server/admin/LDAPProfileTest.java                                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RepeatedCharactersPasswordValidatorConfiguration.xml              |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyNotFoundException.java                                                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DNPropertyDefinition.java                                                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StartTLSExtendedOperationHandlerConfiguration.xml                 |   13 
 opendj-admin/src/main/resources/com/forgerock/opendj/ldap/config.properties                                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustStoreBackendConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/QOSPolicyConfiguration.xml                                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AdminException.java                                                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java                                                       |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java                                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DirectoryStringAttributeSyntaxConfiguration.xml                   |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/java-class.xsl                                                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/spi/Property.java                                                              |   13 
 opendj-admin/src/main/resources/stylesheets/conditions.xsl                                                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AdministratorAction.java                                                              |   13 
 opendj-admin/src/main/java/org/opends/server/util/EmbeddedUtils.java                                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptoManagerConfiguration.xml                                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SchemaBackendConfiguration.xml                                    |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/password.xsl                                                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SASLMechanismHandlerConfiguration.xml                             |   13 
 opendj-admin/src/main/resources/stylesheets/package-info.xsl                                                                             |   13 
 opendj-admin/src/main/resources/stylesheets/property-types.xsl                                                                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubschemaSubentryVirtualAttributeConfiguration.xml                |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgClient.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationSynchronizationProviderConfiguration.xml               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA384PasswordStorageSchemeConfiguration.xml                |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateMapperConfiguration.xml                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueException.java                                                    |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/integer.xsl                                                                   |   13 
 opendj-admin/src/main/java/org/opends/server/types/ConfigChangeResult.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupPluginConfiguration.xml                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyConfiguration.xml                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TimeLimitLogRotationPolicyConfiguration.xml                       |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefinitionResolver.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugTargetConfiguration.xml                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UserDefinedVirtualAttributeConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/spi/package-info.java                                                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClientConnectionMonitorProviderConfiguration.xml                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Base64PasswordStorageSchemeConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPPassThroughAuthenticationPolicyConfiguration.xml              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AdministrationConnectorConfiguration.xml                          |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java                                                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtensionConfiguration.xml                                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StackTraceMonitorProviderConfiguration.xml                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RegularExpressionIdentityMapperConfiguration.xml                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClearPasswordStorageSchemeConfiguration.xml                       |   13 
 opendj-admin/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java                                                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestParentConfiguration.xml                                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAccountStatusNotificationHandlerConfiguration.xml             |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java                                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogPublisherConfiguration.xml                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ResourceLimitsQOSPolicyConfiguration.xml                          |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA1PasswordStorageSchemeConfiguration.xml                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObject.java                                                             |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualAttributeConfiguration.xml                                 |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SystemInfoMonitorProviderConfiguration.xml                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXAlertHandlerConfiguration.xml                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemberVirtualAttributeConfiguration.xml                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StaticGroupImplementationConfiguration.xml                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TraditionalWorkQueueConfiguration.xml                             |   13 
 opendj-admin/src/main/resources/stylesheets/property-types/boolean.xsl                                                                   |   13 
 opendj-admin/src/main/resources/stylesheets/abbreviations.xsl                                                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackendConfiguration.xml                                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootConfiguration.xml                                             |   13 
 opendj-admin/src/main/java/org/opends/server/types/OpenDsException.java                                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryBackendConfiguration.xml                                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/AdminRuntimeException.java                                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackupBackendConfiguration.xml                                    |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyIsMandatoryException.java                                                     |   13 
 opendj-admin/src/main/java-templates/org/opends/server/util/DynamicConstants.java                                                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VersionMonitorProviderConfiguration.xml                           |   13 
 opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif                                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SimilarityBasedPasswordValidatorConfiguration.xml                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AnonymousSASLMechanismHandlerConfiguration.xml                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml      |   13 
 opendj-admin/src/test/java/org/opends/server/admin/SizeUnitTest.java                                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheConfiguration.xml                                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LastModPluginConfiguration.xml                                    |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestChildCfg.java                                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MatchingRuleConfiguration.xml                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordValidatorConfiguration.xml                                |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java                                                           |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SHA1PasswordStorageSchemeConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/api/ConfigChangeListener.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugLogPublisherConfiguration.xml                                |   13 
 opendj-admin/src/main/java/org/opends/server/config/ConfigException.java                                                                 |   13 
 opendj-admin/src/main/resources/stylesheets/manifestMO.xsl                                                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/package-info.java                                                              |   13 
 opendj-admin/src/main/resources/stylesheets/clientMO.xsl                                                                                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Package.xml                                                       |   13 
 opendj-admin/src/main/resources/stylesheets/metaMO.xsl                                                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAccessLogPublisherConfiguration.xml                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowConfiguration.xml                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CramMD5SASLMechanismHandlerConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java                                                    |   13 
 opendj-admin/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java                                                     |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PBKDF2PasswordStorageSchemeConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java                                                 |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java                                            |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRetentionPolicyConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java                                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AESPasswordStorageSchemeConfiguration.xml                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccountStatusNotificationHandlerConfiguration.xml                 |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FractionalLDIFImportPluginConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/stylesheets/cliMOProfile.xsl                                                                             |   13 
 opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif                                                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NumSubordinatesVirtualAttributeConfiguration.xml                  |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ConfigurationClient.java                                                              |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBBackendConfiguration.xml                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA256PasswordStorageSchemeConfiguration.xml                |   13 
 opendj-admin/src/test/java/org/opends/server/admin/TestCfg.java                                                                          |   13 
 opendj-admin/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java                                                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConnectionHandlerConfiguration.xml                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDSEBackendConfiguration.xml                                   |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java                                         |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FreeDiskSpaceLogRetentionPolicyConfiguration.xml                  |   13 
 opendj-server2x-adapter/src/test/resources/config/config.ldif                                                                            |   13 
 opendj-admin/src/main/java/org/opends/server/admin/condition/ContainsCondition.java                                                      |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GlobalConfiguration.xml                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyException.java                                                                |   13 
 opendj-admin/src/main/java/org/opends/server/api/ConfigDeleteListener.java                                                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DynamicGroupImplementationConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntityTagVirtualAttributeConfiguration.xml                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExactMatchIdentityMapperConfiguration.xml                         |   13 
 opendj-admin/src/main/resources/com/forgerock/opendj/ldap/protocol.properties                                                            |   13 
 opendj-admin/src/main/resources/com/forgerock/opendj/ldap/extension.properties                                                           |   13 
 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java                                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheMonitorProviderConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java                                         |   13 
 opendj-admin/src/main/java/org/opends/server/admin/Constraint.java                                                                       |   13 
 opendj-admin/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java                                                    |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessControlHandlerConfiguration.xml                             |   13 
 opendj-admin/src/main/java/org/opends/server/types/AddressMask.java                                                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/PropertyValueVisitor.java                                                             |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java                                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalBackendWorkflowElementConfiguration.xml                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java                                                      |   13 
 opendj-admin/src/main/java/org/opends/server/admin/GenericConstraint.java                                                                |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkQueueConfiguration.xml                                        |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalChangelogDomainConfiguration.xml                          |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeValuePasswordValidatorConfiguration.xml                  |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlindTrustManagerProviderConfiguration.xml                        |   13 
 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java                                               |   13 
 opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java                                                   |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/KeyManagerProviderConfiguration.xml                               |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedErrorLogPublisherConfiguration.xml                       |   13 
 opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TaskBackendConfiguration.xml                                      |   13 
 opendj-admin/src/main/resources/stylesheets/text-utilities.xsl                                                                           |   13 
 opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java                                                            |   13 
 397 files changed, 2,382 insertions(+), 2,777 deletions(-)

diff --git a/opendj-admin/src/main/java-templates/org/opends/server/util/DynamicConstants.java b/opendj-admin/src/main/java-templates/org/opends/server/util/DynamicConstants.java
index 0fe2430..c0b8265 100644
--- a/opendj-admin/src/main/java-templates/org/opends/server/util/DynamicConstants.java
+++ b/opendj-admin/src/main/java-templates/org/opends/server/util/DynamicConstants.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java
index c9d3d05..82326d2 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ACIPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
index fe4d8e6..6c34adf 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AbsoluteInheritedDefaultBehaviorProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
index da13625..77c772d 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AdminException.java b/opendj-admin/src/main/java/org/opends/server/admin/AdminException.java
index b43017a..1c748ac 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AdminException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AdminException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AdminRuntimeException.java b/opendj-admin/src/main/java/org/opends/server/admin/AdminRuntimeException.java
index 64a3629..0e4d566 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AdminRuntimeException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AdminRuntimeException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AdministratorAction.java b/opendj-admin/src/main/java/org/opends/server/admin/AdministratorAction.java
index 92d3e5b..33d23a8 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AdministratorAction.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AdministratorAction.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
index 8207390..1fb5c48 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java
index 13e6c9c..5238ede 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AliasDefaultBehaviorProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java
index 97289a5..63cbbf6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/AttributeTypePropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
index fac54de..da316c7 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ClassLoaderProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
index ec8166e..6070469 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
index 60ee882..2db33cb 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/Configuration.java b/opendj-admin/src/main/java/org/opends/server/admin/Configuration.java
index 421b8d1..5cfe6e2 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/Configuration.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/Configuration.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ConfigurationClient.java b/opendj-admin/src/main/java/org/opends/server/admin/ConfigurationClient.java
index 281205453..b32f038 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ConfigurationClient.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ConfigurationClient.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/Constraint.java b/opendj-admin/src/main/java/org/opends/server/admin/Constraint.java
index 1d5ce6b..3590439 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/Constraint.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/Constraint.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DNPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
index 2b5f8da..11df10d 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DNPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DecodingException.java b/opendj-admin/src/main/java/org/opends/server/admin/DecodingException.java
index 4d7494b..8f2353a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DecodingException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DecodingException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorException.java b/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorException.java
index 707c965..60a52b1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java
index 48802c9..910fbb5 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java b/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java
index 09dcc25..a4e23bd 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefaultBehaviorProviderVisitor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefaultManagedObject.java b/opendj-admin/src/main/java/org/opends/server/admin/DefaultManagedObject.java
index bcdd201..09a16eb 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefaultManagedObject.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefaultManagedObject.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
index 704c222..f6ece41 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefinitionDecodingException.java b/opendj-admin/src/main/java/org/opends/server/admin/DefinitionDecodingException.java
index b7704ae..ab087fc 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefinitionDecodingException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefinitionDecodingException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DefinitionResolver.java b/opendj-admin/src/main/java/org/opends/server/admin/DefinitionResolver.java
index 0aa51a0..aef966c 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DefinitionResolver.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DefinitionResolver.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
index 4a4ab0a..454bc57 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DurationPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/DurationUnit.java b/opendj-admin/src/main/java/org/opends/server/admin/DurationUnit.java
index ec4d3dd..c9a0324 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/DurationUnit.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/DurationUnit.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
index 5ebc2ff..97f29c6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/GenericConstraint.java b/opendj-admin/src/main/java/org/opends/server/admin/GenericConstraint.java
index 59e52c4..e2373c0 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/GenericConstraint.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/GenericConstraint.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java
index 6bdefdb..e31e80a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java
index ad9cdbb..40e1900 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/IPAddressPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueException.java b/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueException.java
index e585024..d4e7403 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueStringException.java b/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueStringException.java
index c080685..27dda07 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueStringException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/IllegalPropertyValueStringException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
index 65c08b8..c87a69f 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
index 96c16e2..9f2097b 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/IntegerPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/LDAPProfile.java b/opendj-admin/src/main/java/org/opends/server/admin/LDAPProfile.java
index 3dba061..b266f0a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/LDAPProfile.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/LDAPProfile.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java
index 8445adf..21d52b2 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectAlreadyExistsException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java
index 5c79718..c241f05 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
index 7cfe16e..c722ce0 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
index 3dcebcf..b38b26d 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java
index ca408ed..a2829e6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectNotFoundException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectOption.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectOption.java
index cda3666..c2242e9 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectOption.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectOption.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPath.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPath.java
index c6c7144..e15be58 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPath.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPath.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java
index 405f975..0e8cd40 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/ManagedObjectPathSerializer.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/OperationsException.java b/opendj-admin/src/main/java/org/opends/server/admin/OperationsException.java
index 4c7d850..c3ae8cd 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/OperationsException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/OperationsException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
index 2b5bf54..5ed838c 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinition.java
index e5e2d81..718a09f 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
index 57d4e5b..659d7ee 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java
index 5f0f9cb..b3bbdaf 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyDefinitionVisitor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyException.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyException.java
index 7fc721c..bdcea6f 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsMandatoryException.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsMandatoryException.java
index 5bfc8bb..c649acf 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsMandatoryException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsMandatoryException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsReadOnlyException.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsReadOnlyException.java
index e57f793..bb1bd43 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsReadOnlyException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsReadOnlyException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsSingleValuedException.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsSingleValuedException.java
index 4b6e7c0..d314b69 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsSingleValuedException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyIsSingleValuedException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyNotFoundException.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyNotFoundException.java
index 5bbe804..c537fc1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyNotFoundException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyNotFoundException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyOption.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyOption.java
index f0629eb..d7cff92 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyOption.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyOption.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyProvider.java
index af03a52..9194ddc 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/PropertyValueVisitor.java b/opendj-admin/src/main/java/org/opends/server/admin/PropertyValueVisitor.java
index e2f7ceb..7c82ed6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/PropertyValueVisitor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/PropertyValueVisitor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/Reference.java b/opendj-admin/src/main/java/org/opends/server/admin/Reference.java
index 78a3ad9..c00ccd7 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/Reference.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/Reference.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinition.java
index 5567526..d4f8306 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java b/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java
index acbb429..a035834 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/RelationDefinitionVisitor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/RelationOption.java b/opendj-admin/src/main/java/org/opends/server/admin/RelationOption.java
index 40c798e..1d8336a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/RelationOption.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/RelationOption.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
index e127938..2107fc6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java
index 43b79de..bbe0762 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
index 2f4f746..c1b525c 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/SizePropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
index e2f7b40..4e03a69 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/SizePropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/SizeUnit.java b/opendj-admin/src/main/java/org/opends/server/admin/SizeUnit.java
index d6ba4da..29668e2 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/SizeUnit.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/SizeUnit.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/StringPropertyDefinition.java b/opendj-admin/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
index f68f6d0..c4cbb9d 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/StringPropertyDefinition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/Tag.java b/opendj-admin/src/main/java/org/opends/server/admin/Tag.java
index d7481f7..3e70258 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/Tag.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/Tag.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/TopCfgDefn.java b/opendj-admin/src/main/java/org/opends/server/admin/TopCfgDefn.java
index df4daaf..34a9fae 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/TopCfgDefn.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/TopCfgDefn.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java b/opendj-admin/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java
index f9d695f..64589ff 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/UndefinedDefaultBehaviorProvider.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/UnknownPropertyDefinitionException.java b/opendj-admin/src/main/java/org/opends/server/admin/UnknownPropertyDefinitionException.java
index 89228a8..10cade1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/UnknownPropertyDefinitionException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/UnknownPropertyDefinitionException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/AdminClientException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/AdminClientException.java
index 7715a0b..c78b3a7 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/AdminClientException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/AdminClientException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/AdminSecurityException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/AdminSecurityException.java
index fd1b96a..0c1d093 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/AdminSecurityException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/AdminSecurityException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationException.java
index 9777cc8..c0dd0e9 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java
index c737eb3..a624e72 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/AuthenticationNotSupportedException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java
index 008d892..2cc86e6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ClientConstraintHandler.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java
index 0c0dd03..f51ad8b 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ConcurrentModificationException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java
index a40f45f..6b632d5 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/IllegalManagedObjectNameException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObject.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObject.java
index a6b58a0..f66a446 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObject.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObject.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java
index 5d929ea..2e6db58 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ManagedObjectDecodingException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ManagementContext.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ManagementContext.java
index 8bb4505..8f0ef36 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ManagementContext.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ManagementContext.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
index 3183ece..0d9d083 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
index 658f986..caa8f8d 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java
index 9853b84..d5cbd17 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPConnection.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
index a1e5a5c..3bbd727 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
index 243b260..a6780f6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java
index 6ae460b..d5860a5 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagementContext.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
index 6602373..9f5f372 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/package-info.java
index cd780cd..67be3f9 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/ldap/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/client/package-info.java
index 470ae16..679c31e 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
index ca68c86..c0c74a9 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java
index 054d361..8c20cae 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Property.java b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Property.java
index de4d731..1bddfa6 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Property.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Property.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
index 2c9116e..42185e8 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/package-info.java
index b49efa6..643bf42 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/spi/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/spi/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/ANDCondition.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/ANDCondition.java
index 86b82e5..27122a1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/ANDCondition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/ANDCondition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/Condition.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/Condition.java
index 30c3c6e..96b09c2 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/Condition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/Condition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/Conditions.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/Conditions.java
index d39de3e..3e228b1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/Conditions.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/Conditions.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/ContainsCondition.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
index 1918c2c..479219a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java
index 9bdaffd..db48a92 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/NOTCondition.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/NOTCondition.java
index b094d31..95391f1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/NOTCondition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/NOTCondition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/ORCondition.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/ORCondition.java
index 8f26479..0174f41 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/ORCondition.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/ORCondition.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/condition/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/condition/package-info.java
index 98ca0e3..d62355b 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/condition/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/condition/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-admin/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 4464ca3..561e800 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/doc/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/doc/package-info.java
index 09d8147..4ffd601 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/doc/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/doc/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/package-info.java
index b4afd62..1590b05 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java
index 014b9af..596ef26 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/AbstractConfigListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
index 4d5d13b..b6b5bea 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
index 5e0e974..ff7c543 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
index a7eeef8..81a8c02 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java
index 7695bd8..cdff67a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
index a3ceb23..653afe4 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
index 833439a..afb984a 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
index 28e7939..cc7e606 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
index e75ac65..f0538b8 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/DNBuilder.java b/opendj-admin/src/main/java/org/opends/server/admin/server/DNBuilder.java
index f7c4448..8587da4 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/DNBuilder.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/DNBuilder.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java
index 2229295..eb17266 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java
index b0de720..7439427 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObject.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
index 6cc8211..1ea7c61 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
index 8d4debd..996c09d 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
index b5f48ad..3f296fb 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
index 35020f4..4d0ff48 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
index a76111c..0744c61 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java
index f8d7fba..c1270ae 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDecodingException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
index 0797b2b..0a93cb3 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
index 42c0fd2..a8642cc 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagementContext.java b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
index 7956f5f..0cee2a1 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/server/package-info.java b/opendj-admin/src/main/java/org/opends/server/admin/server/package-info.java
index dbf8776..47acbbd 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/server/package-info.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/server/package-info.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/api/ConfigAddListener.java b/opendj-admin/src/main/java/org/opends/server/api/ConfigAddListener.java
index ce25695..2f9719e 100644
--- a/opendj-admin/src/main/java/org/opends/server/api/ConfigAddListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/api/ConfigAddListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/api/ConfigChangeListener.java b/opendj-admin/src/main/java/org/opends/server/api/ConfigChangeListener.java
index 4913da9..0a67389 100644
--- a/opendj-admin/src/main/java/org/opends/server/api/ConfigChangeListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/api/ConfigChangeListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/api/ConfigDeleteListener.java b/opendj-admin/src/main/java/org/opends/server/api/ConfigDeleteListener.java
index 3aa58f4..b413f39 100644
--- a/opendj-admin/src/main/java/org/opends/server/api/ConfigDeleteListener.java
+++ b/opendj-admin/src/main/java/org/opends/server/api/ConfigDeleteListener.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/Aci.java b/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
index de1b5df..70b099d 100644
--- a/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/AciException.java b/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/AciException.java
index 9c637f6..0cbec5f 100644
--- a/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/AciException.java
+++ b/opendj-admin/src/main/java/org/opends/server/authorization/dseecompat/AciException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/config/ConfigEntry.java b/opendj-admin/src/main/java/org/opends/server/config/ConfigEntry.java
index 832668b..89db1b5 100644
--- a/opendj-admin/src/main/java/org/opends/server/config/ConfigEntry.java
+++ b/opendj-admin/src/main/java/org/opends/server/config/ConfigEntry.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/config/ConfigException.java b/opendj-admin/src/main/java/org/opends/server/config/ConfigException.java
index ac64a1a..fcb155a 100644
--- a/opendj-admin/src/main/java/org/opends/server/config/ConfigException.java
+++ b/opendj-admin/src/main/java/org/opends/server/config/ConfigException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/AddressMask.java b/opendj-admin/src/main/java/org/opends/server/types/AddressMask.java
index 46a6cd2..035345f 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/AddressMask.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/AddressMask.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/ConfigChangeResult.java b/opendj-admin/src/main/java/org/opends/server/types/ConfigChangeResult.java
index 0a1e0bf..96480b3 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/ConfigChangeResult.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/ConfigChangeResult.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java b/opendj-admin/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
index ad55627..654b202 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/DirectoryException.java b/opendj-admin/src/main/java/org/opends/server/types/DirectoryException.java
index a18a332..8b37026 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/DirectoryException.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/DirectoryException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/IdentifiedException.java b/opendj-admin/src/main/java/org/opends/server/types/IdentifiedException.java
index 566e009..4e643ca 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/IdentifiedException.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/IdentifiedException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/InitializationException.java b/opendj-admin/src/main/java/org/opends/server/types/InitializationException.java
index 7754c72..be223be 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/InitializationException.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/InitializationException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/LDAPException.java b/opendj-admin/src/main/java/org/opends/server/types/LDAPException.java
index d976f9c..551071b 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/LDAPException.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/LDAPException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/types/OpenDsException.java b/opendj-admin/src/main/java/org/opends/server/types/OpenDsException.java
index 14f04d9..1c77ad7 100644
--- a/opendj-admin/src/main/java/org/opends/server/types/OpenDsException.java
+++ b/opendj-admin/src/main/java/org/opends/server/types/OpenDsException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/java/org/opends/server/util/EmbeddedUtils.java b/opendj-admin/src/main/java/org/opends/server/util/EmbeddedUtils.java
index db09e2d..a783e8a 100644
--- a/opendj-admin/src/main/java/org/opends/server/util/EmbeddedUtils.java
+++ b/opendj-admin/src/main/java/org/opends/server/util/EmbeddedUtils.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/admin.properties b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/admin.properties
index 15d9a36..cfbf05d 100644
--- a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/admin.properties
+++ b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/admin.properties
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/config.properties b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/config.properties
index aa8c5c0..ba5ec67 100644
--- a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/config.properties
+++ b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/config.properties
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/extension.properties b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/extension.properties
index dcc339a..477ae42 100644
--- a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/extension.properties
+++ b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/extension.properties
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/protocol.properties b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/protocol.properties
index b571b70..e6c9d1a 100644
--- a/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/protocol.properties
+++ b/opendj-admin/src/main/resources/com/forgerock/opendj/ldap/protocol.properties
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AESPasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AESPasswordStorageSchemeConfiguration.xml
index 777c4d2..580505b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AESPasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AESPasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessControlHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessControlHandlerConfiguration.xml
index a7c6f72..fc81fde 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessControlHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessControlHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogFilteringCriteriaConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogFilteringCriteriaConfiguration.xml
index 2edc2a9..b151e10 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogFilteringCriteriaConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogFilteringCriteriaConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogPublisherConfiguration.xml
index 145fd74..067b208 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccessLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccountStatusNotificationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccountStatusNotificationHandlerConfiguration.xml
index a75c5ba..6b684db 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccountStatusNotificationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AccountStatusNotificationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AdministrationConnectorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AdministrationConnectorConfiguration.xml
index f16beca..51ae000 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AdministrationConnectorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AdministrationConnectorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AlertHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AlertHandlerConfiguration.xml
index ed1ba2b..0b4c976 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AlertHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AlertHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AnonymousSASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AnonymousSASLMechanismHandlerConfiguration.xml
index 1f977da..6ba859d 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AnonymousSASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AnonymousSASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeCleanupPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeCleanupPluginConfiguration.xml
index afb9d00..61df2bd 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeCleanupPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeCleanupPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeSyntaxConfiguration.xml
index d4df635..e1e8f4c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
index 8c57b43..6eb7e9d 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeValuePasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeValuePasswordValidatorConfiguration.xml
index 416b922..73c0159 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeValuePasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AttributeValuePasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AuthenticationPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AuthenticationPolicyConfiguration.xml
index cff70ba..1901706 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AuthenticationPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/AuthenticationPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackendConfiguration.xml
index b910808..2aa1716 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackupBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackupBackendConfiguration.xml
index dcdd14b..8836301 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackupBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BackupBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Base64PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Base64PasswordStorageSchemeConfiguration.xml
index 3eea194..ac1a50c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Base64PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Base64PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlindTrustManagerProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlindTrustManagerProviderConfiguration.xml
index 482f4bf..56355e4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlindTrustManagerProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlindTrustManagerProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlowfishPasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlowfishPasswordStorageSchemeConfiguration.xml
index b7008d7..64dcadb 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlowfishPasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/BlowfishPasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CancelExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CancelExtendedOperationHandlerConfiguration.xml
index ab75f9d..f8c7855 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CancelExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CancelExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateAttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateAttributeSyntaxConfiguration.xml
index a51a090..6786200 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateAttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateAttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/CDDLv1_0.txt
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
   ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/CDDLv1_0.txt.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateMapperConfiguration.xml
index e10bc50..f449622 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CertificateMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ChangeNumberControlPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ChangeNumberControlPluginConfiguration.xml
index 26a9e3b..baba10f 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ChangeNumberControlPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ChangeNumberControlPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CharacterSetPasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CharacterSetPasswordValidatorConfiguration.xml
index 222cb2b..1e5cd76 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CharacterSetPasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CharacterSetPasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClearPasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClearPasswordStorageSchemeConfiguration.xml
index f6dd078..cf61ad4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClearPasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClearPasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClientConnectionMonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClientConnectionMonitorProviderConfiguration.xml
index 233ca91..4f6291b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClientConnectionMonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ClientConnectionMonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollationMatchingRuleConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollationMatchingRuleConfiguration.xml
index e8b6635..9083179 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollationMatchingRuleConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollationMatchingRuleConfiguration.xml
@@ -7,17 +7,16 @@
  ! (the "License").  You may not use this file except in compliance
  ! with the License.
  !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
- ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
  ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! If applicable, add the following below this CDDL HEADER, with the
+ ! fields enclosed by brackets "[]" replaced with your own identifying
+ ! information:
  !      Portions Copyright [yyyy] [name of copyright owner]
  !
  ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
index 9c974fa..3f3042a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConfigFileHandlerBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConfigFileHandlerBackendConfiguration.xml
index 7f9f31f..ca5dd82 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConfigFileHandlerBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConfigFileHandlerBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConnectionHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConnectionHandlerConfiguration.xml
index 63c44aa..257bf51 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConnectionHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ConnectionHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CountryStringAttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CountryStringAttributeSyntaxConfiguration.xml
index 62df373..89ef3f4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CountryStringAttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CountryStringAttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/CDDLv1_0.txt
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
   ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/CDDLv1_0.txt.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CramMD5SASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CramMD5SASLMechanismHandlerConfiguration.xml
index 89c94f0..bb1f096 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CramMD5SASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CramMD5SASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptPasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptPasswordStorageSchemeConfiguration.xml
index f15a61b..883e58b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptPasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptPasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptoManagerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptoManagerConfiguration.xml
index a779424..184d39a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptoManagerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/CryptoManagerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugLogPublisherConfiguration.xml
index d6ea5cf..509568b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugTargetConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugTargetConfiguration.xml
index 76ecda3..eaa79c1 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugTargetConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DebugTargetConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DictionaryPasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DictionaryPasswordValidatorConfiguration.xml
index e71c772..c13b6a5 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DictionaryPasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DictionaryPasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DigestMD5SASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DigestMD5SASLMechanismHandlerConfiguration.xml
index d95466d..d4d197c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DigestMD5SASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DigestMD5SASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DirectoryStringAttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DirectoryStringAttributeSyntaxConfiguration.xml
index 5102300..3d775f8 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DirectoryStringAttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DirectoryStringAttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DseeCompatAccessControlHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DseeCompatAccessControlHandlerConfiguration.xml
index 81b013e..cbbaedd 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DseeCompatAccessControlHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DseeCompatAccessControlHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DynamicGroupImplementationConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DynamicGroupImplementationConfiguration.xml
index cbfc9c9..ee06e2d 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DynamicGroupImplementationConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/DynamicGroupImplementationConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntityTagVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntityTagVirtualAttributeConfiguration.xml
index 2c6c4b5..97a37f3 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntityTagVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntityTagVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheConfiguration.xml
index 0493174..32904b6 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheMonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheMonitorProviderConfiguration.xml
index 3ef0add..b59ce28 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheMonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryCacheMonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryDNVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryDNVirtualAttributeConfiguration.xml
index 03e662d..d929556 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryDNVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryDNVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDPluginConfiguration.xml
index 84e3447..d7016f0 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDVirtualAttributeConfiguration.xml
index 782432a..63e801e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/EntryUUIDVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogAccountStatusNotificationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
index 6db4bd8..940e029 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogPublisherConfiguration.xml
index ede08e9..e1e3984 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ErrorLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExactMatchIdentityMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExactMatchIdentityMapperConfiguration.xml
index 90d9208..0e68c1e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExactMatchIdentityMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExactMatchIdentityMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtendedOperationHandlerConfiguration.xml
index f9d2564..8e23722 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtensionConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtensionConfiguration.xml
index fef4b22..3324004 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtensionConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExtensionConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalChangelogDomainConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalChangelogDomainConfiguration.xml
index 9fd8ce9..e3c45c5 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalChangelogDomainConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalChangelogDomainConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalSASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalSASLMechanismHandlerConfiguration.xml
index 238db89..2a01348 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalSASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ExternalSASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FIFOEntryCacheConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FIFOEntryCacheConfiguration.xml
index c33e022..2aee5f6 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FIFOEntryCacheConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FIFOEntryCacheConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAccessLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAccessLogPublisherConfiguration.xml
index 289b179..b6240e9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAccessLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAccessLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAuditLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAuditLogPublisherConfiguration.xml
index 102af0f..5a314b4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAuditLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedAuditLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedDebugLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedDebugLogPublisherConfiguration.xml
index 60099ac..7eea88a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedDebugLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedDebugLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedErrorLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedErrorLogPublisherConfiguration.xml
index 970270a..56226bf 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedErrorLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedErrorLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedHTTPAccessLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedHTTPAccessLogPublisherConfiguration.xml
index 5cc8bb0..83e4d86 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedHTTPAccessLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedHTTPAccessLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedKeyManagerProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedKeyManagerProviderConfiguration.xml
index 7360d6a..b27fd67 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedKeyManagerProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedKeyManagerProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedTrustManagerProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedTrustManagerProviderConfiguration.xml
index 77c2fa2..befb5bd 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedTrustManagerProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileBasedTrustManagerProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileCountLogRetentionPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileCountLogRetentionPolicyConfiguration.xml
index 7d03d16..850b188 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileCountLogRetentionPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileCountLogRetentionPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileSystemEntryCacheConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileSystemEntryCacheConfiguration.xml
index 7869b78..98e7ec9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileSystemEntryCacheConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FileSystemEntryCacheConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FingerprintCertificateMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FingerprintCertificateMapperConfiguration.xml
index ce52aa9..6855f96 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FingerprintCertificateMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FingerprintCertificateMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FixedTimeLogRotationPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FixedTimeLogRotationPolicyConfiguration.xml
index fc2c21e..44ad4e4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FixedTimeLogRotationPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FixedTimeLogRotationPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FractionalLDIFImportPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FractionalLDIFImportPluginConfiguration.xml
index 7a4320d..bb3f466 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FractionalLDIFImportPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FractionalLDIFImportPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FreeDiskSpaceLogRetentionPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
index 4837001..8ec1953 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GSSAPISASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GSSAPISASLMechanismHandlerConfiguration.xml
index d889e1c..af07e96 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GSSAPISASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GSSAPISASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetConnectionIdExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetConnectionIdExtendedOperationHandlerConfiguration.xml
index 36ecb46..bfea4c1 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetConnectionIdExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetConnectionIdExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
index c012256..501bbbc 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GlobalConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GlobalConfiguration.xml
index e259165..06050d9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GlobalConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GlobalConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GoverningStructureRuleVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GoverningStructureRuleVirtualAttributeConfiguration.xml
index 325c58f..bae6c27 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GoverningStructureRuleVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GoverningStructureRuleVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GroupImplementationConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GroupImplementationConfiguration.xml
index 8dd3606..c53741c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GroupImplementationConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/GroupImplementationConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPAccessLogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPAccessLogPublisherConfiguration.xml
index 5e384a9..9f3029c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPAccessLogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPAccessLogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPConnectionHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPConnectionHandlerConfiguration.xml
index a1ae312..1ad8738 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPConnectionHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HTTPConnectionHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HasSubordinatesVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HasSubordinatesVirtualAttributeConfiguration.xml
index e724bf1..f6d6c32 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HasSubordinatesVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/HasSubordinatesVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IdentityMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IdentityMapperConfiguration.xml
index 4a8f2e1..7c11a97 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IdentityMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IdentityMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IsMemberOfVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IsMemberOfVirtualAttributeConfiguration.xml
index 351a2ab..f837402 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IsMemberOfVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/IsMemberOfVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXAlertHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXAlertHandlerConfiguration.xml
index 2390ecf..1475feb 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXAlertHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXAlertHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXConnectionHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXConnectionHandlerConfiguration.xml
index 5c8e33d..04c84d3 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXConnectionHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JMXConnectionHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JPEGAttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JPEGAttributeSyntaxConfiguration.xml
index 613d6ef..6c1f18a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JPEGAttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/JPEGAttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/KeyManagerProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/KeyManagerProviderConfiguration.xml
index 9a87a82..20c4a8e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/KeyManagerProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/KeyManagerProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPAttributeDescriptionListPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPAttributeDescriptionListPluginConfiguration.xml
index 726f23c..1ef4aee 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPAttributeDescriptionListPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPAttributeDescriptionListPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPConnectionHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPConnectionHandlerConfiguration.xml
index 072b49b..ab47b17 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPConnectionHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPConnectionHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPPassThroughAuthenticationPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPPassThroughAuthenticationPolicyConfiguration.xml
index 685e4c4..08a7a27 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPPassThroughAuthenticationPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDAPPassThroughAuthenticationPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFBackendConfiguration.xml
index 3275a77..1fc8602 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFConnectionHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFConnectionHandlerConfiguration.xml
index 7657e62..2165266 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFConnectionHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LDIFConnectionHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LastModPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LastModPluginConfiguration.xml
index 5292da3..8bb63a4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LastModPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LastModPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LengthBasedPasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LengthBasedPasswordValidatorConfiguration.xml
index 86a8b89..bcd6199 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LengthBasedPasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LengthBasedPasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalBackendWorkflowElementConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalBackendWorkflowElementConfiguration.xml
index 8bf9e8e..ae61246 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalBackendWorkflowElementConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalBackendWorkflowElementConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBBackendConfiguration.xml
index 630adbc..fe838bc 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBIndexConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBIndexConfiguration.xml
index e94f2fc..3a6b8f2 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBIndexConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBIndexConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBVLVIndexConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBVLVIndexConfiguration.xml
index e1befec..606a091 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBVLVIndexConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LocalDBVLVIndexConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogPublisherConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogPublisherConfiguration.xml
index 054115b..a7df348 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogPublisherConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogPublisherConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRetentionPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRetentionPolicyConfiguration.xml
index 644c928..4e6a5a5 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRetentionPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRetentionPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRotationPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRotationPolicyConfiguration.xml
index 1dd892e..8e07ddc 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRotationPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/LogRotationPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MD5PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MD5PasswordStorageSchemeConfiguration.xml
index 3c89373..36d4622 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MD5PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MD5PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MatchingRuleConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MatchingRuleConfiguration.xml
index fe15693..25e9ac3 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MatchingRuleConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MatchingRuleConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemberVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemberVirtualAttributeConfiguration.xml
index ca2e9b1..8a302ec 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemberVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemberVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryBackendConfiguration.xml
index f956dca..80be979 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryUsageMonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryUsageMonitorProviderConfiguration.xml
index 9f3a481..68f3663 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryUsageMonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MemoryUsageMonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorBackendConfiguration.xml
index a1243bc..1d8116f 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorProviderConfiguration.xml
index 65afdcd..ededb0e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/MonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupConfiguration.xml
index 44e82c1..0af18d0 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupPluginConfiguration.xml
index a971766..9c8bba2 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NetworkGroupPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NullBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NullBackendConfiguration.xml
index 9bebd0f..7bd125e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NullBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NullBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NumSubordinatesVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NumSubordinatesVirtualAttributeConfiguration.xml
index 1b6911c..b19ffc8 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NumSubordinatesVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/NumSubordinatesVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PBKDF2PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PBKDF2PasswordStorageSchemeConfiguration.xml
index 347a67e..79c8a41 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PBKDF2PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PBKDF2PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PKCS11KeyManagerProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PKCS11KeyManagerProviderConfiguration.xml
index d1e21ed..5f9e417 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PKCS11KeyManagerProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PKCS11KeyManagerProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Package.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Package.xml
index f4aeeb9..ff846bc 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Package.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/Package.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ParallelWorkQueueConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ParallelWorkQueueConfiguration.xml
index 9211057..e4f6353 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ParallelWorkQueueConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ParallelWorkQueueConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordExpirationTimeVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordExpirationTimeVirtualAttributeConfiguration.xml
index c59ce47..9917d42 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordExpirationTimeVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordExpirationTimeVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/CDDLv1_0.txt
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
   ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordGeneratorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordGeneratorConfiguration.xml
index c680aa1..7dcb2b4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordGeneratorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordGeneratorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordModifyExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordModifyExtendedOperationHandlerConfiguration.xml
index bf19c61..73fde4c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordModifyExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordModifyExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyConfiguration.xml
index 39cb377..76ee4d4 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyImportPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyImportPluginConfiguration.xml
index 17b8925..8d58a02 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyImportPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyImportPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
index 0f50992..940753c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicySubentryVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicySubentryVirtualAttributeConfiguration.xml
index ab9ac2f..04b3378 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicySubentryVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordPolicySubentryVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordStorageSchemeConfiguration.xml
index cbc1d3a..c5357de 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordValidatorConfiguration.xml
index c4624ba..897f1d1 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PlainSASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PlainSASLMechanismHandlerConfiguration.xml
index 96b983b..211f1f9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PlainSASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PlainSASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginConfiguration.xml
index 287a7b6..728d47d 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginRootConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginRootConfiguration.xml
index e322a97..2d28020 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginRootConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/PluginRootConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ProfilerPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ProfilerPluginConfiguration.xml
index 5e43582..8a17f8e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ProfilerPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ProfilerPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/QOSPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/QOSPolicyConfiguration.xml
index 7e1358e..2d35570 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/QOSPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/QOSPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RC4PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RC4PasswordStorageSchemeConfiguration.xml
index 5d61348..9b2e7bf 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RC4PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RC4PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RandomPasswordGeneratorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RandomPasswordGeneratorConfiguration.xml
index 4e66c86..227524e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RandomPasswordGeneratorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RandomPasswordGeneratorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReferentialIntegrityPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReferentialIntegrityPluginConfiguration.xml
index d2c48b5..054ed3e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReferentialIntegrityPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReferentialIntegrityPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RegularExpressionIdentityMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RegularExpressionIdentityMapperConfiguration.xml
index 1246987..3deeba1 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RegularExpressionIdentityMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RegularExpressionIdentityMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RepeatedCharactersPasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RepeatedCharactersPasswordValidatorConfiguration.xml
index 8386732..7d5955b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RepeatedCharactersPasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RepeatedCharactersPasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationDomainConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationDomainConfiguration.xml
index 965ade3..1b96569 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationDomainConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationDomainConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationServerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationServerConfiguration.xml
index 44c63cf..6d0aa6b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationServerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationServerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationSynchronizationProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationSynchronizationProviderConfiguration.xml
index 7b6bb44..197cb43 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationSynchronizationProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ReplicationSynchronizationProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RequestFilteringQOSPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RequestFilteringQOSPolicyConfiguration.xml
index 002d2de..6e07adb 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RequestFilteringQOSPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RequestFilteringQOSPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ResourceLimitsQOSPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ResourceLimitsQOSPolicyConfiguration.xml
index 29eca9e..44026e9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ResourceLimitsQOSPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/ResourceLimitsQOSPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootConfiguration.xml
index 9fb9b50..c554e52 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNConfiguration.xml
index fcfe6fe..aa81e83 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNUserConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNUserConfiguration.xml
index 107e724..02ee034 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNUserConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDNUserConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDSEBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDSEBackendConfiguration.xml
index f5f5f7d..e07d16c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDSEBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/RootDSEBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SASLMechanismHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SASLMechanismHandlerConfiguration.xml
index c74a3d5..811be90 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SASLMechanismHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SASLMechanismHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SHA1PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SHA1PasswordStorageSchemeConfiguration.xml
index 98609ea..9c5217b 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SHA1PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SHA1PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAccountStatusNotificationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAccountStatusNotificationHandlerConfiguration.xml
index 65220c4..2f31157 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAccountStatusNotificationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAccountStatusNotificationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAlertHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAlertHandlerConfiguration.xml
index 6d3adea..22fc8666 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAlertHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SMTPAlertHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SNMPConnectionHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SNMPConnectionHandlerConfiguration.xml
index 42eb800..cec77ab 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SNMPConnectionHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SNMPConnectionHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedMD5PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedMD5PasswordStorageSchemeConfiguration.xml
index 07d976d..bcfa8b9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedMD5PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedMD5PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA1PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA1PasswordStorageSchemeConfiguration.xml
index 2a0731c..6c24459 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA1PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA1PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA256PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA256PasswordStorageSchemeConfiguration.xml
index 090d47b..2b5276a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA256PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA256PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA384PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA384PasswordStorageSchemeConfiguration.xml
index 1f1683f..53999f9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA384PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA384PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA512PasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA512PasswordStorageSchemeConfiguration.xml
index dabcff0..893e632 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA512PasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SaltedSHA512PasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SambaPasswordPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SambaPasswordPluginConfiguration.xml
index 9f6aeea..06c1a02 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SambaPasswordPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SambaPasswordPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SchemaBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SchemaBackendConfiguration.xml
index 9a72fd8..b8cfae3 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SchemaBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SchemaBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SevenBitCleanPluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SevenBitCleanPluginConfiguration.xml
index 3d03b81..407a665 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SevenBitCleanPluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SevenBitCleanPluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SimilarityBasedPasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SimilarityBasedPasswordValidatorConfiguration.xml
index cb1a394..63d1dff 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SimilarityBasedPasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SimilarityBasedPasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRetentionPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRetentionPolicyConfiguration.xml
index d29ff3c..17bb213 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRetentionPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRetentionPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRotationPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRotationPolicyConfiguration.xml
index 7228f89..5cfe302 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRotationPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SizeLimitLogRotationPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SoftReferenceEntryCacheConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SoftReferenceEntryCacheConfiguration.xml
index 8616eb5..f668682 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SoftReferenceEntryCacheConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SoftReferenceEntryCacheConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StackTraceMonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StackTraceMonitorProviderConfiguration.xml
index 3f4c1df..9169962 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StackTraceMonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StackTraceMonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StartTLSExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StartTLSExtendedOperationHandlerConfiguration.xml
index 2946a0b..bbc3380 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StartTLSExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StartTLSExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StaticGroupImplementationConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StaticGroupImplementationConfiguration.xml
index a96c625..ec8f8f8 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StaticGroupImplementationConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StaticGroupImplementationConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StructuralObjectClassVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StructuralObjectClassVirtualAttributeConfiguration.xml
index 539ca51..34c3e32 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StructuralObjectClassVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/StructuralObjectClassVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
index 69da46f..7652a54 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectDNToUserAttributeCertificateMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
index cf3f3b3..73667a5 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectEqualsDNCertificateMapperConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectEqualsDNCertificateMapperConfiguration.xml
index 3d194b2..cbdfa12 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectEqualsDNCertificateMapperConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubjectEqualsDNCertificateMapperConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubschemaSubentryVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubschemaSubentryVirtualAttributeConfiguration.xml
index 8aa17eb..6b54544 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubschemaSubentryVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SubschemaSubentryVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SynchronizationProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SynchronizationProviderConfiguration.xml
index f1dced4..a00018a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SynchronizationProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SynchronizationProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SystemInfoMonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SystemInfoMonitorProviderConfiguration.xml
index d658b97..c8f03ce 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SystemInfoMonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/SystemInfoMonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TaskBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TaskBackendConfiguration.xml
index d8a0207..3bf6fe9 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TaskBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TaskBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TelephoneNumberAttributeSyntaxConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TelephoneNumberAttributeSyntaxConfiguration.xml
index a049b63..ef10a9c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TelephoneNumberAttributeSyntaxConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TelephoneNumberAttributeSyntaxConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TimeLimitLogRotationPolicyConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TimeLimitLogRotationPolicyConfiguration.xml
index c763c49..9b7f4ed 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TimeLimitLogRotationPolicyConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TimeLimitLogRotationPolicyConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TraditionalWorkQueueConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TraditionalWorkQueueConfiguration.xml
index 77c1d9d..668247c 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TraditionalWorkQueueConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TraditionalWorkQueueConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TripleDESPasswordStorageSchemeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TripleDESPasswordStorageSchemeConfiguration.xml
index 11393d3..1ce221f 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TripleDESPasswordStorageSchemeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TripleDESPasswordStorageSchemeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustManagerProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustManagerProviderConfiguration.xml
index 2581fb1..b1d4123 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustManagerProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustManagerProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustStoreBackendConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustStoreBackendConfiguration.xml
index 5e00fa1..c48d388 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustStoreBackendConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/TrustStoreBackendConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueAttributePluginConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueAttributePluginConfiguration.xml
index f9aa374..de95f5e 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueAttributePluginConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueAttributePluginConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueCharactersPasswordValidatorConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueCharactersPasswordValidatorConfiguration.xml
index cf0a328..d85764d 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueCharactersPasswordValidatorConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UniqueCharactersPasswordValidatorConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UserDefinedVirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UserDefinedVirtualAttributeConfiguration.xml
index 64aa365..dea3398 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UserDefinedVirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/UserDefinedVirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VersionMonitorProviderConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VersionMonitorProviderConfiguration.xml
index bd70e87..e773d7a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VersionMonitorProviderConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VersionMonitorProviderConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualAttributeConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualAttributeConfiguration.xml
index a407387..612983d 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualAttributeConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualAttributeConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualStaticGroupImplementationConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualStaticGroupImplementationConfiguration.xml
index badef88..92f88e8 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualStaticGroupImplementationConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/VirtualStaticGroupImplementationConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WhoAmIExtendedOperationHandlerConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WhoAmIExtendedOperationHandlerConfiguration.xml
index d327629..4d7287a 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WhoAmIExtendedOperationHandlerConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WhoAmIExtendedOperationHandlerConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkQueueConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkQueueConfiguration.xml
index 759a231..f10d4b0 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkQueueConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkQueueConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowConfiguration.xml
index ed137fb..ddda222 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowElementConfiguration.xml b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowElementConfiguration.xml
index 6284ef9..035f476 100644
--- a/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowElementConfiguration.xml
+++ b/opendj-admin/src/main/resources/definitions/org/forgerock/opendj/admin/WorkflowElementConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/abbreviations.xsl b/opendj-admin/src/main/resources/stylesheets/abbreviations.xsl
index 6c02a0d..eb8b113 100644
--- a/opendj-admin/src/main/resources/stylesheets/abbreviations.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/abbreviations.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/cliMOProfile.xsl b/opendj-admin/src/main/resources/stylesheets/cliMOProfile.xsl
index 617321c..d05fed4 100644
--- a/opendj-admin/src/main/resources/stylesheets/cliMOProfile.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/cliMOProfile.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/clientMO.xsl b/opendj-admin/src/main/resources/stylesheets/clientMO.xsl
index 92a441d..0f16efb 100644
--- a/opendj-admin/src/main/resources/stylesheets/clientMO.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/clientMO.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/conditions.xsl b/opendj-admin/src/main/resources/stylesheets/conditions.xsl
index 2b856b5..b471f74 100644
--- a/opendj-admin/src/main/resources/stylesheets/conditions.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/conditions.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/java-utilities.xsl b/opendj-admin/src/main/resources/stylesheets/java-utilities.xsl
index 0d32bfc..8d83e1f 100644
--- a/opendj-admin/src/main/resources/stylesheets/java-utilities.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/java-utilities.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
@@ -48,17 +47,16 @@
                      ' * (the &quot;License&quot;).  You may not use this file except in compliance&#xa;',
                      ' * with the License.&#xa;',
                      ' *&#xa;',
-                     ' * You can obtain a copy of the license at&#xa;',
-                     ' * trunk/opends/resource/legal-notices/OpenDS.LICENSE&#xa;',
-                     ' * or https://OpenDS.dev.java.net/OpenDS.LICENSE.&#xa;',
+                     ' * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt&#xa;',
+                     ' * or http://forgerock.org/license/CDDLv1.0.html.&#xa;',
                      ' * See the License for the specific language governing permissions&#xa;',
                      ' * and limitations under the License.&#xa;',
                      ' *&#xa;',
                      ' * When distributing Covered Code, include this CDDL HEADER in each&#xa;',
-                     ' * file and include the License file at&#xa;',
-                     ' * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,&#xa;',
-                     ' * add the following below this CDDL HEADER, with the fields enclosed&#xa;',
-                     ' * by brackets &quot;[]&quot; replaced with your own identifying information:&#xa;',
+                     ' * file and include the License file at legal-notices/CDDLv1_0.txt.&#xa;',
+                     ' * If applicable, add the following below this CDDL HEADER, with the&#xa;',
+                     ' * fields enclosed by brackets &quot;[]&quot; replaced with your own identifying&#xa;',
+                     ' * information:&#xa;',
                      ' *      Portions Copyright [yyyy] [name of copyright owner]&#xa;',
                      ' *&#xa;',
                      ' * CDDL HEADER END&#xa;',
diff --git a/opendj-admin/src/main/resources/stylesheets/ldapMOProfile.xsl b/opendj-admin/src/main/resources/stylesheets/ldapMOProfile.xsl
index 754028d..486ebca 100644
--- a/opendj-admin/src/main/resources/stylesheets/ldapMOProfile.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/ldapMOProfile.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/manifestMO.xsl b/opendj-admin/src/main/resources/stylesheets/manifestMO.xsl
index f64fed8..4699897 100644
--- a/opendj-admin/src/main/resources/stylesheets/manifestMO.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/manifestMO.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/messagesMO.xsl b/opendj-admin/src/main/resources/stylesheets/messagesMO.xsl
index 1d98649..afd676a 100644
--- a/opendj-admin/src/main/resources/stylesheets/messagesMO.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/messagesMO.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/metaMO.xsl b/opendj-admin/src/main/resources/stylesheets/metaMO.xsl
index 343f0b5..e0320b4 100644
--- a/opendj-admin/src/main/resources/stylesheets/metaMO.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/metaMO.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/package-info.xsl b/opendj-admin/src/main/resources/stylesheets/package-info.xsl
index e38498e..4bc9a26 100644
--- a/opendj-admin/src/main/resources/stylesheets/package-info.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/package-info.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/preprocessor.xsl b/opendj-admin/src/main/resources/stylesheets/preprocessor.xsl
index f74c0cf..2f40d7e 100644
--- a/opendj-admin/src/main/resources/stylesheets/preprocessor.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/preprocessor.xsl
@@ -1,21 +1,21 @@
-<!-- CDDL HEADER START
+<!--
+  ! CDDL HEADER START
   !
   ! The contents of this file are subject to the terms of the
   ! Common Development and Distribution License, Version 1.0 only
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types.xsl b/opendj-admin/src/main/resources/stylesheets/property-types.xsl
index c0f4d8d..272d89f 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/aci.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/aci.xsl
index 46aa234..2bf2bde 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/aci.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/aci.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/aggregation.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/aggregation.xsl
index c931b76..a26c835 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/aggregation.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/aggregation.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/attribute-type.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/attribute-type.xsl
index 3b9f446..1093afd 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/attribute-type.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/attribute-type.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/boolean.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/boolean.xsl
index e7310d1..78fb109 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/boolean.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/boolean.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/dn.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/dn.xsl
index 5514e2f..5ad0e02 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/dn.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/dn.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/duration.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/duration.xsl
index b5529ab..64aea1d 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/duration.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/duration.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/enumeration.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/enumeration.xsl
index 694ed08..c318e4f 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/enumeration.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/enumeration.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl
index 60cf61c..cce9b93 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/integer.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/integer.xsl
index cf148c8..0fef6c6 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/integer.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/integer.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/ip-address-mask.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/ip-address-mask.xsl
index 46661f0..6984e31 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/ip-address-mask.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/ip-address-mask.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/ip-address.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/ip-address.xsl
index 4087016..bacdb53 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/ip-address.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/ip-address.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/java-class.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/java-class.xsl
index 73183af..7c474b6 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/java-class.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/java-class.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/oid.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/oid.xsl
index 95e27ba..d9c9a4b 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/oid.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/oid.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/password.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/password.xsl
index 8a87bee..7b7be3d 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/password.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/password.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/size.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/size.xsl
index bb67a98..9f0e1d7 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/size.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/size.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/property-types/string.xsl b/opendj-admin/src/main/resources/stylesheets/property-types/string.xsl
index d46206d..99571ee 100644
--- a/opendj-admin/src/main/resources/stylesheets/property-types/string.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/property-types/string.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/serverMO.xsl b/opendj-admin/src/main/resources/stylesheets/serverMO.xsl
index e2576cb..f65c033 100644
--- a/opendj-admin/src/main/resources/stylesheets/serverMO.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/serverMO.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/main/resources/stylesheets/text-utilities.xsl b/opendj-admin/src/main/resources/stylesheets/text-utilities.xsl
index eaefa99..d3d05fb 100644
--- a/opendj-admin/src/main/resources/stylesheets/text-utilities.xsl
+++ b/opendj-admin/src/main/resources/stylesheets/text-utilities.xsl
@@ -6,17 +6,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
index 281bf02..e255500 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/AdminTestCase.java b/opendj-admin/src/test/java/org/opends/server/admin/AdminTestCase.java
index 671b4d5..5d7e03b 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/AdminTestCase.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/AdminTestCase.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java
index 3d56533..c8237a5 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
index 80c35f3..c058566 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
index 512bbf1..7ad081b 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
index e19b651..68e1958 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
index e2703b7..a913fb0 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
index 8e266b6..8ae04d7 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/DurationUnitTest.java b/opendj-admin/src/test/java/org/opends/server/admin/DurationUnitTest.java
index 9730ca8..ecd9c5e 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/DurationUnitTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/DurationUnitTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
index 1e5f0c1..11c433d 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
index de3ca4f..1bad73b 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/LDAPProfileTest.java b/opendj-admin/src/test/java/org/opends/server/admin/LDAPProfileTest.java
index ee613f9..5d2e64c 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/LDAPProfileTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/LDAPProfileTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java b/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
index 87fbda7..66ee14e 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java b/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
index 0b5fb18..1efa6e9 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/MockLDAPProfile.java b/opendj-admin/src/test/java/org/opends/server/admin/MockLDAPProfile.java
index 3d41520..bc51efc 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/MockLDAPProfile.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/MockLDAPProfile.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-admin/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
index 6660b17..1d82efd 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
index 9418353..3ff985d 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/SizeUnitTest.java b/opendj-admin/src/test/java/org/opends/server/admin/SizeUnitTest.java
index 39966b7..ef38b1f 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/SizeUnitTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/SizeUnitTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java b/opendj-admin/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
index b127f08..10105cb 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestCfg.java b/opendj-admin/src/test/java/org/opends/server/admin/TestCfg.java
index db8dfaa..28b3470 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestCfg.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestCfg.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfg.java b/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfg.java
index f0e3d18..ddbac74 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfg.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfg.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgClient.java b/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgClient.java
index c2d7f89..6504768 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgClient.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgClient.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgDefn.java b/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
index c5f87cc..7b2c3bc 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestChildConfiguration.xml b/opendj-admin/src/test/java/org/opends/server/admin/TestChildConfiguration.xml
index 734cd32..89a45d9 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestChildConfiguration.xml
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestChildConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfg.java b/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfg.java
index db943cc..31d6766 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfg.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfg.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgClient.java b/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgClient.java
index fcb168a..3a05a2e 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgClient.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgClient.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgDefn.java b/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
index 0d953ab..c138ebb 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestParentConfiguration.xml b/opendj-admin/src/test/java/org/opends/server/admin/TestParentConfiguration.xml
index 8192db2..8e010e8 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestParentConfiguration.xml
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestParentConfiguration.xml
@@ -7,17 +7,16 @@
   ! (the "License").  You may not use this file except in compliance
   ! with the License.
   !
-  ! You can obtain a copy of the license at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
-  ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! See the License for the specific language governing permissions
   ! and limitations under the License.
   !
   ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! If applicable, add the following below this CDDL HEADER, with the
+  ! fields enclosed by brackets "[]" replaced with your own identifying
+  ! information:
   !      Portions Copyright [yyyy] [name of copyright owner]
   !
   ! CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java b/opendj-admin/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java
index 29f0fd3..d42dba3 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-admin/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java b/opendj-admin/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
index 78efc0e..a3466f3 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
  *      Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
diff --git a/opendj-server2x-adapter/src/test/resources/config/config.ldif b/opendj-server2x-adapter/src/test/resources/config/config.ldif
index a463e96..22e55f0 100644
--- a/opendj-server2x-adapter/src/test/resources/config/config.ldif
+++ b/opendj-server2x-adapter/src/test/resources/config/config.ldif
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif b/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif
index 529a55e..1fd579c 100644
--- a/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif
+++ b/opendj-server2x-adapter/src/test/resources/config/schema/00-core.ldif
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif b/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif
index 4deec1f..e7f8f2a 100644
--- a/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif
+++ b/opendj-server2x-adapter/src/test/resources/config/schema/01-pwpolicy.ldif
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif b/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif
index db60f57..aeb151b 100644
--- a/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif
+++ b/opendj-server2x-adapter/src/test/resources/config/schema/02-config.ldif
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif b/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif
index eb71ad6..f94da8c 100644
--- a/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif
+++ b/opendj-server2x-adapter/src/test/resources/config/schema/04-rfc2307bis.ldif
@@ -5,17 +5,16 @@
 # (the "License").  You may not use this file except in compliance
 # with the License.
 #
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
 #      Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
diff --git a/pom.xml b/pom.xml
index 22594de..b552cb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
     </site>
   </distributionManagement>
   <modules>
+    <!--module>opendj-admin</module-->
     <module>opendj-core</module>
     <module>opendj-grizzly</module>
     <module>opendj-ldap-sdk</module>

--
Gitblit v1.10.0