From 4e26b9d75f085a5196a0cb10595cac0319ced1f5 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 12 Feb 2015 12:08:25 +0000
Subject: [PATCH] OPENDJ-1777 Move test source directory to src/test/java
---
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/UtilsTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgClient.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/LoggingCategoryNamesTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DummyReplicationDomain.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPTrapManagerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TraditionalWorkQueueTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgClient.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BoundedWorkQueueStrategyTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/CompareOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ManageAccountTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ChangeNumberControlPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TypesTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/FakeStressReplicationDomain.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BinaryAttributeSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/MemoryReductionTestCases.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/SmallMapTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/InstallationTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AdminTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/pom.xml | 20 +--------
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/PluginAPITestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/HostPortTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AdditionalLogItemTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ByteArrayTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVerifyJob.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/MonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/SchemaTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ControlsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/CoreTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualLengthApproximateMatchingRule.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/FakeReplicationDomain.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironmentTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ToolsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributesTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationBrokerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestDeleteChangeRecordEntry.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchNoServerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentConfiguration.xml | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/APITestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ConstraintTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/TraceSettingsTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JebTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/LDAPSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/DNSTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/SuiteRunner.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfg.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExtensionsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SchemaHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/UtilTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/PluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java | 0
opendj-sdk/opendj-server-legacy/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml | 65 ++++++++++++++++----------------
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/EnumRightTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEntryContainer.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestRebuildTask.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/ConfigurationMock.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/LevenshteinDistanceTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciBodyTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyDNChangeRecordEntry.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExtensionTestUtils.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeConstants.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildConfiguration.xml | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/DirectoryExceptionTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPConnectionManager.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/TestChangeNotificationListener.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.properties | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestImportJob.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfg.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeBuilderTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.properties | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CoreSchemaProviderTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/GenericBackendTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPFilter.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TasksTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/BackendTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java | 0
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java | 0
451 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/pom.xml b/opendj-sdk/opendj-server-legacy/pom.xml
index 4aeebfb..61322fc 100644
--- a/opendj-sdk/opendj-server-legacy/pom.xml
+++ b/opendj-sdk/opendj-server-legacy/pom.xml
@@ -231,7 +231,7 @@
</resource>
<!-- Property files used in test sources -->
<resource>
- <directory>tests/unit-tests-testng/src/server</directory>
+ <directory>src/test/java</directory>
<filtering>false</filtering>
<includes>
<include>**/*.properties</include>
@@ -454,19 +454,6 @@
</sources>
</configuration>
</execution>
- <!-- Take into account tests directory for the build -->
- <execution>
- <id>test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>tests/unit-tests-testng/src/server</source>
- </sources>
- </configuration>
- </execution>
<!-- Parse version to generate properties (major.version, minor.version,
...) -->
<execution>
@@ -542,7 +529,7 @@
<goal>testCompile</goal>
</goals>
<configuration>
- <testSourceDirectory>tests/unit-tests-testng/src/server</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<showDeprecation>false</showDeprecation>
<showWarnings>false</showWarnings>
<testCompilerArgument>-nowarn</testCompilerArgument>
@@ -1245,7 +1232,7 @@
<goal>verify</goal>
</goals>
<configuration>
- <testSourceDirectory>tests/unit-tests-testng/src/server</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<excludes>
<exclude>org/opends/server/snmp/**</exclude>
<exclude>org/opends/quicksetup/**</exclude>
@@ -1355,7 +1342,6 @@
<sources>
<source>src/snmp/src</source>
<source>src/snmp/generated</source>
- <source>tests/unit-tests-testng/src/server/snmp</source>
</sources>
</configuration>
</execution>
diff --git a/opendj-sdk/opendj-server-legacy/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml b/opendj-sdk/opendj-server-legacy/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml
index c21b7f5..b4381de 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml
+++ b/opendj-sdk/opendj-server-legacy/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml
@@ -23,46 +23,45 @@
that we don't want to enforce against unit tests.
It is not possible to rely on same file provided by forgerock-build-tools because
- 1) path of tests source files is different,
- 2) lot of classes are violating others suppressions.
- Once/if tests are moved under /src/test/java directory and additional suppressions
- added at the end of the file can be removed due to code cleaning, then this file may
- be deleted and replaced by equivalent in forgerock-build-tools.
+ lot of classes are violating others suppressions.
+ Once additional suppressions added at the end of the file can be removed due to code
+ cleaning, then this file may be deleted and replaced by equivalent in
+ forgerock-build-tools.
-->
<!-- check-src-default.xml -->
- <suppress checks="JavadocPackage" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="JavadocType" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="JavadocMethod" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="JavadocVariable" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="JavadocStyle" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="JavadocPackage" files="/src/test/java" />
+ <suppress checks="JavadocType" files="/src/test/java" />
+ <suppress checks="JavadocMethod" files="/src/test/java" />
+ <suppress checks="JavadocVariable" files="/src/test/java" />
+ <suppress checks="JavadocStyle" files="/src/test/java" />
<!--
- <suppress checks="ModifierOrder" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="RedundantModifier" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="ModifierOrder" files="/src/test/java" />
+ <suppress checks="RedundantModifier" files="/src/test/java" />
-->
- <suppress checks="RedundantThrows" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="FinalClass" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="HideUtilityClassConstructor" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="InterfaceIsType" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="VisibilityModifier" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="RedundantThrows" files="/src/test/java" />
+ <suppress checks="FinalClass" files="/src/test/java" />
+ <suppress checks="HideUtilityClassConstructor" files="/src/test/java" />
+ <suppress checks="InterfaceIsType" files="/src/test/java" />
+ <suppress checks="VisibilityModifier" files="/src/test/java" />
- <suppress checks="Translation" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="FileLength" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="MethodLength" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="ParameterNumber" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="MissingSwitchDefault" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="DesignForExtension" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="TodoComment" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="Translation" files="/src/test/java" />
+ <suppress checks="FileLength" files="/src/test/java" />
+ <suppress checks="MethodLength" files="/src/test/java" />
+ <suppress checks="ParameterNumber" files="/src/test/java" />
+ <suppress checks="MissingSwitchDefault" files="/src/test/java" />
+ <suppress checks="DesignForExtension" files="/src/test/java" />
+ <suppress checks="TodoComment" files="/src/test/java" />
<!-- Additional suppressions (compared to forgerock-build-tools equivalent file) -->
- <suppress checks="LineLength" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="RegexpSingleline" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="FileTabCharacter" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="LineLength" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="RedundantImport" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="UnusedImports" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="EmptyStatement" files="/tests/unit-tests-testng/src/server" />
- <suppress checks="EqualsHashCode" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="LineLength" files="/src/test/java" />
+ <suppress checks="RegexpSingleline" files="/src/test/java" />
+ <suppress checks="FileTabCharacter" files="/src/test/java" />
+ <suppress checks="LineLength" files="/src/test/java" />
+ <suppress checks="RedundantImport" files="/src/test/java" />
+ <suppress checks="UnusedImports" files="/src/test/java" />
+ <suppress checks="EmptyStatement" files="/src/test/java" />
+ <suppress checks="EqualsHashCode" files="/src/test/java" />
-</suppressions>
\ No newline at end of file
+</suppressions>
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/forgerock/opendj/config/server/AdminTestCaseUtils.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/InstallationTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/InstallationTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/QuickSetupTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/UtilsTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/UtilsTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/ConfigurationMock.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/ConfigurationMock.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/ConfigurationMock.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/ConfigurationMock.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/MemoryReductionTestCases.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/MemoryReductionTestCases.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/ServerContextBuilder.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/ServerContextBuilder.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/SuiteRunner.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/SuiteRunner.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestListener.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/TestTextWriter.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AdminTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AdminTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AggregationPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/BooleanPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/EnumPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/LDAPProfileTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/MockLDAPProfile.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/StringPropertyDefinitionTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestCfg.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfg.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfg.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgClient.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgClient.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.properties
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildCfgDefn.properties
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildConfiguration.xml
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestChildConfiguration.xml
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfg.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfg.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgClient.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgClient.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.properties
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentCfgDefn.properties
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentConfiguration.xml
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestParentConfiguration.xml
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/TestTopCfgDefnTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/ValidateConfigDefinitionsTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/LDAPClientTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockConstraint.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/MockLDAPConnection.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/AggregationServerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ConstraintTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ConstraintTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DNBuilderTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/ListenerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/server/MockConstraint.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/APITestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/APITestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/AlertHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/AuthenticationPolicyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/ConfigChangeListenerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/DITCacheMapTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/TestTaskListener.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/PluginAPITestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/api/plugin/PluginAPITestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciBodyTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciBodyTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AciTests.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/DNSTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/DNSTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/EnumRightTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/EnumRightTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/IPTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/SSFTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/BackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/BackendTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/GenericBackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/GenericBackendTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRuleImpl.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRuleImpl.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaTestMatchingRuleImpl.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JebTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JebTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEntryContainer.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEntryContainer.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestEnvManager.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestImportJob.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestImportJob.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestJebFormat.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVLVIndex.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVerifyJob.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestVerifyJob.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/TestJebFormat.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/TestJebFormat.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestJebFormat.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/persistit/PersistitTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ControlsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ControlsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ExternalChangelogControlTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordControlTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PasswordPolicyControlTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/ServerSideSortControlTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AbandonOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/BoundedWorkQueueStrategyTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BoundedWorkQueueStrategyTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/BoundedWorkQueueStrategyTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BoundedWorkQueueStrategyTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/CompareOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/CompareOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/ConfigurationHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/ConfigurationHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/CoreTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/CoreTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/IdleTimeLimitTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/OperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/PasswordPolicyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/PluginConfigManagerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/RejectUnauthReqTests.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SchemaHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SchemaHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SchemaHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SchemaHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SearchOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryManagerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubtreeSpecificationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/TestChangeNotificationListener.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/TestChangeNotificationListener.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/TestModifyDNOperation.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/UnbindOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CancelExtendedOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ConfigFileHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DefaultEntryCacheTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DummyAlertHandler.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExtensionTestUtils.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExtensionTestUtils.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExtensionsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExtensionsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FIFOEntryCacheTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/JMXAlertHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PBKDF2PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PKCS5S2PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SASLOverTLSTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestAlertGenerator.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TestPasswordValidator.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/LoggingCategoryNamesTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/loggers/LoggingCategoryNamesTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/LoggingCategoryNamesTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/loggers/TraceSettingsTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/TraceSettingsTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/loggers/TraceSettingsTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/loggers/TraceSettingsTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/GenericMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/InternalSearchMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/InternalSearchMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/MonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/MonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/StackTraceMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/SystemInfoMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/TestMonitorProvider.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/monitors/VersionMonitorTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/DelayPreOpPlugin.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/DisconnectClientPlugin.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/InvocationCounterPlugin.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/LDAPADListPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/NullPlugin.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/PluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/PluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/ShortCircuitPlugin.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/UpdatePreOpPlugin.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/GSERParserTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/GSERParserTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/asn1/GSERParserTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/InternalTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/internal/TestInternalSearchListener.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ByteChannelReaderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/ASN1ReaderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LDAPv2TestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPFilter.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPFilter.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/SchemaReplicationTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNGeneratorTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/ServerStateTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrInfoTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DomainFakeCfg.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DummyReplicationDomain.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DummyReplicationDomain.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DummyReplicationDomain.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/DummyReplicationDomain.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/IsolationTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/TopologyViewTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ValueInfoTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ByteArrayTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ByteArrayTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/AssuredReplicationServerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplServerFakeConfiguration.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/BlockLogReaderWriterTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDBTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/LogFileTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/LogFileTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogFileTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/LogTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/LogTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/LogTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/ReplicationEnvironmentTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironmentTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/file/ReplicationEnvironmentTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ReplicationEnvironmentTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ECLMultiDomainDBCursorTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/FakeUpdateMsg.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicaCursorTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ComputeBestServerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/FakeReplicationDomain.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/FakeReplicationDomain.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/FakeStressReplicationDomain.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/FakeStressReplicationDomain.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationBrokerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationBrokerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationBrokerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationBrokerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeTypeSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BinaryAttributeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BinaryAttributeSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CertificateSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CollationMatchingRuleTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CoreSchemaProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CoreSchemaProviderTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CoreSchemaProviderTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CoreSchemaProviderTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/GuideSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/IA5StringSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/IntegerSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/LDAPSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/LDAPSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/OtherMailboxSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/SchemaTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/SchemaTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/TelexSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/TimeBasedMatchingRuleTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UTCTimeSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UUIDSyntaxTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPConnectionManager.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPConnectionManager.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPTrapManagerTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/snmp/SNMPTrapManagerTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/AllowedTaskTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/DisconnectClientTaskTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TasksTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TasksTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestImportAndExport.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestRebuildTask.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestRebuildTask.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/EncodePasswordTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPCompareTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPDeleteTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPModifyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPPasswordModifyTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchNoServerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchNoServerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPSearchTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFDiffTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDIFSearchTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ListBackendsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ManageAccountTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ManageAccountTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ToolsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/ToolsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/VerifyIndexTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AdditionalLogItemTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AdditionalLogItemTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeBuilderTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeBuilderTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeConstants.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeConstants.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributesTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/AttributesTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/DITContentRuleTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/DirectoryExceptionTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/DirectoryExceptionTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/EntrySchemaCheckingTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/HostPortTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/HostPortTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/InitializationExceptionTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/SearchFilterTests.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/SmallMapTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/SmallMapTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/SmallMapTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/SmallMapTest.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestAttributeType.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestDN.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestEntry.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestRDN.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TypesTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/TypesTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeRuleTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/CertificateManagerTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/EmbeddedUtilsTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/LevenshteinDistanceTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/LevenshteinDistanceTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestAddChangeRecordEntry.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestBase64.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestChangeRecordEntry.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestCrypt.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestDeleteChangeRecordEntry.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestDeleteChangeRecordEntry.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFReader.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestLDIFWriter.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyChangeRecordEntry.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyDNChangeRecordEntry.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestModifyDNChangeRecordEntry.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/UtilTestCase.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/UtilTestCase.java
diff --git a/opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
similarity index 100%
rename from opendj-sdk/opendj-server-legacy/tests/unit-tests-testng/src/server/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
rename to opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
--
Gitblit v1.10.0