This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 6e769af47473899515c10b9cfc989899e53a492d Author: Christopher Tubbs <[email protected]> AuthorDate: Fri Aug 7 13:20:44 2020 -0400 Rename master module to manager Re #1641 - Relocate and rename maven artifacts for master to use new name, manager --- assemble/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- server/{master => manager}/.gitignore | 0 server/{master => manager}/pom.xml | 6 +++--- .../src/main/java/org/apache/accumulo/master/EventCoordinator.java | 0 .../main/java/org/apache/accumulo/master/FateServiceHandler.java | 0 .../src/main/java/org/apache/accumulo/master/Master.java | 0 .../java/org/apache/accumulo/master/MasterClientServiceHandler.java | 0 .../src/main/java/org/apache/accumulo/master/MasterExecutable.java | 0 .../src/main/java/org/apache/accumulo/master/MasterTime.java | 0 .../main/java/org/apache/accumulo/master/TabletGroupWatcher.java | 0 .../main/java/org/apache/accumulo/master/metrics/MasterMetrics.java | 0 .../org/apache/accumulo/master/metrics/MasterMetricsFactory.java | 0 .../java/org/apache/accumulo/master/metrics/ReplicationMetrics.java | 0 .../org/apache/accumulo/master/metrics/fate/FateMetricValues.java | 0 .../java/org/apache/accumulo/master/metrics/fate/FateMetrics.java | 0 .../java/org/apache/accumulo/master/recovery/RecoveryManager.java | 0 .../master/replication/DistributedWorkQueueWorkAssigner.java | 0 .../org/apache/accumulo/master/replication/FinishedWorkUpdater.java | 0 .../accumulo/master/replication/MasterReplicationCoordinator.java | 0 .../master/replication/RemoveCompleteReplicationRecords.java | 0 .../org/apache/accumulo/master/replication/ReplicationDriver.java | 0 .../apache/accumulo/master/replication/SequentialWorkAssigner.java | 0 .../java/org/apache/accumulo/master/replication/StatusMaker.java | 0 .../apache/accumulo/master/replication/UnorderedWorkAssigner.java | 0 .../java/org/apache/accumulo/master/replication/WorkDriver.java | 0 .../main/java/org/apache/accumulo/master/replication/WorkMaker.java | 0 .../src/main/java/org/apache/accumulo/master/state/MergeStats.java | 0 .../main/java/org/apache/accumulo/master/state/SetGoalState.java | 0 .../src/main/java/org/apache/accumulo/master/state/TableCounts.java | 0 .../src/main/java/org/apache/accumulo/master/state/TableStats.java | 0 .../java/org/apache/accumulo/master/tableOps/ChangeTableState.java | 0 .../main/java/org/apache/accumulo/master/tableOps/MasterRepo.java | 0 .../main/java/org/apache/accumulo/master/tableOps/TableInfo.java | 0 .../main/java/org/apache/accumulo/master/tableOps/TraceRepo.java | 0 .../src/main/java/org/apache/accumulo/master/tableOps/Utils.java | 0 .../org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java | 0 .../apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java | 0 .../accumulo/master/tableOps/bulkVer1/CompleteBulkImport.java | 0 .../org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java | 0 .../org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java | 0 .../apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java | 0 .../java/org/apache/accumulo/master/tableOps/bulkVer2/BulkInfo.java | 0 .../apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java | 0 .../accumulo/master/tableOps/bulkVer2/CompleteBulkImport.java | 0 .../org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java | 0 .../apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java | 0 .../java/org/apache/accumulo/master/tableOps/clone/CloneInfo.java | 0 .../org/apache/accumulo/master/tableOps/clone/CloneMetadata.java | 0 .../org/apache/accumulo/master/tableOps/clone/ClonePermissions.java | 0 .../java/org/apache/accumulo/master/tableOps/clone/CloneTable.java | 0 .../org/apache/accumulo/master/tableOps/clone/CloneZookeeper.java | 0 .../org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java | 0 .../org/apache/accumulo/master/tableOps/compact/CompactRange.java | 0 .../apache/accumulo/master/tableOps/compact/CompactionDriver.java | 0 .../accumulo/master/tableOps/compact/cancel/CancelCompactions.java | 0 .../master/tableOps/compact/cancel/FinishCancelCompaction.java | 0 .../java/org/apache/accumulo/master/tableOps/create/ChooseDir.java | 0 .../org/apache/accumulo/master/tableOps/create/CreateTable.java | 0 .../apache/accumulo/master/tableOps/create/FinishCreateTable.java | 0 .../apache/accumulo/master/tableOps/create/PopulateMetadata.java | 0 .../apache/accumulo/master/tableOps/create/PopulateZookeeper.java | 0 .../apache/accumulo/master/tableOps/create/SetupPermissions.java | 0 .../java/org/apache/accumulo/master/tableOps/delete/CleanUp.java | 0 .../org/apache/accumulo/master/tableOps/delete/DeleteTable.java | 0 .../org/apache/accumulo/master/tableOps/merge/TableRangeOp.java | 0 .../org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java | 0 .../accumulo/master/tableOps/namespace/create/CreateNamespace.java | 0 .../master/tableOps/namespace/create/FinishCreateNamespace.java | 0 .../accumulo/master/tableOps/namespace/create/NamespaceInfo.java | 0 .../tableOps/namespace/create/PopulateZookeeperWithNamespace.java | 0 .../master/tableOps/namespace/create/SetupNamespacePermissions.java | 0 .../accumulo/master/tableOps/namespace/delete/DeleteNamespace.java | 0 .../accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java | 0 .../accumulo/master/tableOps/namespace/rename/RenameNamespace.java | 0 .../org/apache/accumulo/master/tableOps/rename/RenameTable.java | 0 .../org/apache/accumulo/master/tableOps/tableExport/ExportInfo.java | 0 .../apache/accumulo/master/tableOps/tableExport/ExportTable.java | 0 .../accumulo/master/tableOps/tableExport/WriteExportFiles.java | 0 .../accumulo/master/tableOps/tableImport/CreateImportDir.java | 0 .../accumulo/master/tableOps/tableImport/FinishImportTable.java | 0 .../master/tableOps/tableImport/ImportPopulateZookeeper.java | 0 .../master/tableOps/tableImport/ImportSetupPermissions.java | 0 .../apache/accumulo/master/tableOps/tableImport/ImportTable.java | 0 .../accumulo/master/tableOps/tableImport/ImportedTableInfo.java | 0 .../accumulo/master/tableOps/tableImport/MapImportFileNames.java | 0 .../accumulo/master/tableOps/tableImport/MoveExportedFiles.java | 0 .../accumulo/master/tableOps/tableImport/PopulateMetadataTable.java | 0 .../java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java | 0 .../java/org/apache/accumulo/master/upgrade/UpgradeCoordinator.java | 0 .../src/main/java/org/apache/accumulo/master/upgrade/Upgrader.java | 0 .../main/java/org/apache/accumulo/master/upgrade/Upgrader8to9.java | 0 .../main/java/org/apache/accumulo/master/upgrade/Upgrader9to10.java | 0 .../src/main/java/org/apache/accumulo/master/util/FateAdmin.java | 0 .../main/java/org/apache/accumulo/master/util/TableValidators.java | 0 server/{master => manager}/src/main/spotbugs/exclude-filter.xml | 0 .../org/apache/accumulo/master/metrics/ReplicationMetricsTest.java | 0 .../apache/accumulo/master/metrics/fate/FateMetricValuesTest.java | 0 .../org/apache/accumulo/master/metrics/fate/FateMetricsTest.java | 0 .../org/apache/accumulo/master/metrics/fate/InMemTestCollector.java | 0 .../apache/accumulo/master/metrics/fate/ZooKeeperTestingServer.java | 0 .../replication/DistributedWorkQueueWorkAssignerHelperTest.java | 0 .../master/replication/MasterReplicationCoordinatorTest.java | 0 .../accumulo/master/replication/SequentialWorkAssignerTest.java | 0 .../accumulo/master/replication/UnorderedWorkAssignerTest.java | 0 .../java/org/apache/accumulo/master/replication/WorkMakerTest.java | 0 .../org/apache/accumulo/master/tableOps/ShutdownTServerTest.java | 0 .../accumulo/master/tableOps/bulkVer2/PrepBulkImportTest.java | 0 .../accumulo/master/tableOps/tableImport/ImportTableTest.java | 0 .../org/apache/accumulo/master/upgrade/RootFilesUpgradeTest.java | 0 .../java/org/apache/accumulo/master/upgrade/Upgrader9to10Test.java | 0 server/{master => manager}/src/test/resources/accumulo.properties | 0 .../{master => manager}/src/test/resources/conf/accumulo-site.xml | 0 .../{master => manager}/src/test/resources/conf/generic_logger.xml | 0 .../{master => manager}/src/test/resources/conf/monitor_logger.xml | 0 .../src/test/resources/hadoop-metrics2-accumulo.properties | 0 .../{master => manager}/src/test/resources/log4j2-test.properties | 0 test/pom.xml | 2 +- 119 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index 401add8..b1e9af0 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -188,7 +188,7 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-master</artifactId> + <artifactId>accumulo-manager</artifactId> <optional>true</optional> </dependency> <dependency> diff --git a/minicluster/pom.xml b/minicluster/pom.xml index ff15682..c477a77 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-master</artifactId> + <artifactId>accumulo-manager</artifactId> </dependency> <dependency> <groupId>org.apache.accumulo</groupId> diff --git a/pom.xml b/pom.xml index a415f2b..43770a1 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ <module>minicluster</module> <module>server/base</module> <module>server/gc</module> - <module>server/master</module> + <module>server/manager</module> <module>server/monitor</module> <module>server/native</module> <module>server/tracer</module> @@ -320,7 +320,7 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-master</artifactId> + <artifactId>accumulo-manager</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/server/master/.gitignore b/server/manager/.gitignore similarity index 100% rename from server/master/.gitignore rename to server/manager/.gitignore diff --git a/server/master/pom.xml b/server/manager/pom.xml similarity index 95% rename from server/master/pom.xml rename to server/manager/pom.xml index ec8de17..ac22aee 100644 --- a/server/master/pom.xml +++ b/server/manager/pom.xml @@ -27,9 +27,9 @@ <version>2.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>accumulo-master</artifactId> - <name>Apache Accumulo Master Server</name> - <description>The master server for Apache Accumulo for load balacing and other system-wide operations.</description> + <artifactId>accumulo-manager</artifactId> + <name>Apache Accumulo Manager Server</name> + <description>The manager server for Apache Accumulo for load balacing and other system-wide operations.</description> <dependencies> <dependency> <groupId>com.beust</groupId> diff --git a/server/master/src/main/java/org/apache/accumulo/master/EventCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/master/EventCoordinator.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/EventCoordinator.java rename to server/manager/src/main/java/org/apache/accumulo/master/EventCoordinator.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/master/FateServiceHandler.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java rename to server/manager/src/main/java/org/apache/accumulo/master/FateServiceHandler.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/manager/src/main/java/org/apache/accumulo/master/Master.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/Master.java rename to server/manager/src/main/java/org/apache/accumulo/master/Master.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java rename to server/manager/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterExecutable.java b/server/manager/src/main/java/org/apache/accumulo/master/MasterExecutable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/MasterExecutable.java rename to server/manager/src/main/java/org/apache/accumulo/master/MasterExecutable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java b/server/manager/src/main/java/org/apache/accumulo/master/MasterTime.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/MasterTime.java rename to server/manager/src/main/java/org/apache/accumulo/master/MasterTime.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/manager/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java rename to server/manager/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetrics.java b/server/manager/src/main/java/org/apache/accumulo/master/metrics/MasterMetrics.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetrics.java rename to server/manager/src/main/java/org/apache/accumulo/master/metrics/MasterMetrics.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java b/server/manager/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java rename to server/manager/src/main/java/org/apache/accumulo/master/metrics/MasterMetricsFactory.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java b/server/manager/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java rename to server/manager/src/main/java/org/apache/accumulo/master/metrics/ReplicationMetrics.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetricValues.java b/server/manager/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetricValues.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetricValues.java rename to server/manager/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetricValues.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetrics.java b/server/manager/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetrics.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetrics.java rename to server/manager/src/main/java/org/apache/accumulo/master/metrics/fate/FateMetrics.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/manager/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java rename to server/manager/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/ReplicationDriver.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java b/server/manager/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java rename to server/manager/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java b/server/manager/src/main/java/org/apache/accumulo/master/state/MergeStats.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java rename to server/manager/src/main/java/org/apache/accumulo/master/state/MergeStats.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java b/server/manager/src/main/java/org/apache/accumulo/master/state/SetGoalState.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java rename to server/manager/src/main/java/org/apache/accumulo/master/state/SetGoalState.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/TableCounts.java b/server/manager/src/main/java/org/apache/accumulo/master/state/TableCounts.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/state/TableCounts.java rename to server/manager/src/main/java/org/apache/accumulo/master/state/TableCounts.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java b/server/manager/src/main/java/org/apache/accumulo/master/state/TableStats.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java rename to server/manager/src/main/java/org/apache/accumulo/master/state/TableStats.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/ChangeTableState.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/TableInfo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/TraceRepo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/Utils.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/Utils.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/BulkImport.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CleanUpBulkImport.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CompleteBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CompleteBulkImport.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CompleteBulkImport.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CompleteBulkImport.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/CopyFailed.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer1/LoadFiles.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkInfo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkInfo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkInfo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkInfo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CleanUpBulkImport.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CompleteBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CompleteBulkImport.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CompleteBulkImport.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/CompleteBulkImport.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/LoadFiles.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImport.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneInfo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneInfo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneInfo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneInfo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneMetadata.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/ClonePermissions.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneZookeeper.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneZookeeper.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/CloneZookeeper.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/clone/FinishCloneTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactRange.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/CompactionDriver.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/CancelCompactions.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/compact/cancel/FinishCancelCompaction.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/ChooseDir.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/CreateTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/FinishCreateTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateMetadata.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateZookeeper.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateZookeeper.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/PopulateZookeeper.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/create/SetupPermissions.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/SetupPermissions.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/create/SetupPermissions.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/create/SetupPermissions.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/delete/CleanUp.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/delete/DeleteTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOp.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/merge/TableRangeOpWait.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/CreateNamespace.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/FinishCreateNamespace.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/NamespaceInfo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/NamespaceInfo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/NamespaceInfo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/NamespaceInfo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/PopulateZookeeperWithNamespace.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/PopulateZookeeperWithNamespace.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/PopulateZookeeperWithNamespace.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/PopulateZookeeperWithNamespace.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/SetupNamespacePermissions.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/SetupNamespacePermissions.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/SetupNamespacePermissions.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/create/SetupNamespacePermissions.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/DeleteNamespace.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/delete/NamespaceCleanUp.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/namespace/rename/RenameNamespace.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/rename/RenameTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportInfo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportInfo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportInfo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportInfo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableExport/ExportTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableExport/WriteExportFiles.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/CreateImportDir.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/CreateImportDir.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/CreateImportDir.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/CreateImportDir.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/FinishImportTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportPopulateZookeeper.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportPopulateZookeeper.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportPopulateZookeeper.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportPopulateZookeeper.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportSetupPermissions.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportedTableInfo.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportedTableInfo.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportedTableInfo.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/ImportedTableInfo.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MapImportFileNames.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MapImportFileNames.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MapImportFileNames.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MapImportFileNames.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MoveExportedFiles.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MoveExportedFiles.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MoveExportedFiles.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/MoveExportedFiles.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/PopulateMetadataTable.java b/server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/PopulateMetadataTable.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tableOps/tableImport/PopulateMetadataTable.java rename to server/manager/src/main/java/org/apache/accumulo/master/tableOps/tableImport/PopulateMetadataTable.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java b/server/manager/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java rename to server/manager/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/upgrade/UpgradeCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/master/upgrade/UpgradeCoordinator.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/upgrade/UpgradeCoordinator.java rename to server/manager/src/main/java/org/apache/accumulo/master/upgrade/UpgradeCoordinator.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/upgrade/Upgrader.java b/server/manager/src/main/java/org/apache/accumulo/master/upgrade/Upgrader.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/upgrade/Upgrader.java rename to server/manager/src/main/java/org/apache/accumulo/master/upgrade/Upgrader.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/upgrade/Upgrader8to9.java b/server/manager/src/main/java/org/apache/accumulo/master/upgrade/Upgrader8to9.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/upgrade/Upgrader8to9.java rename to server/manager/src/main/java/org/apache/accumulo/master/upgrade/Upgrader8to9.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/upgrade/Upgrader9to10.java b/server/manager/src/main/java/org/apache/accumulo/master/upgrade/Upgrader9to10.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/upgrade/Upgrader9to10.java rename to server/manager/src/main/java/org/apache/accumulo/master/upgrade/Upgrader9to10.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java b/server/manager/src/main/java/org/apache/accumulo/master/util/FateAdmin.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java rename to server/manager/src/main/java/org/apache/accumulo/master/util/FateAdmin.java diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java b/server/manager/src/main/java/org/apache/accumulo/master/util/TableValidators.java similarity index 100% rename from server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java rename to server/manager/src/main/java/org/apache/accumulo/master/util/TableValidators.java diff --git a/server/master/src/main/spotbugs/exclude-filter.xml b/server/manager/src/main/spotbugs/exclude-filter.xml similarity index 100% rename from server/master/src/main/spotbugs/exclude-filter.xml rename to server/manager/src/main/spotbugs/exclude-filter.xml diff --git a/server/master/src/test/java/org/apache/accumulo/master/metrics/ReplicationMetricsTest.java b/server/manager/src/test/java/org/apache/accumulo/master/metrics/ReplicationMetricsTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/metrics/ReplicationMetricsTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/metrics/ReplicationMetricsTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricValuesTest.java b/server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricValuesTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricValuesTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricValuesTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricsTest.java b/server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricsTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricsTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricsTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/metrics/fate/InMemTestCollector.java b/server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/InMemTestCollector.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/metrics/fate/InMemTestCollector.java rename to server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/InMemTestCollector.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/metrics/fate/ZooKeeperTestingServer.java b/server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/ZooKeeperTestingServer.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/metrics/fate/ZooKeeperTestingServer.java rename to server/manager/src/test/java/org/apache/accumulo/master/metrics/fate/ZooKeeperTestingServer.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java b/server/manager/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/replication/MasterReplicationCoordinatorTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java b/server/manager/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java b/server/manager/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java b/server/manager/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/replication/WorkMakerTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java b/server/manager/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImportTest.java b/server/manager/src/test/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImportTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImportTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/tableOps/bulkVer2/PrepBulkImportTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/tableImport/ImportTableTest.java b/server/manager/src/test/java/org/apache/accumulo/master/tableOps/tableImport/ImportTableTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/tableOps/tableImport/ImportTableTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/tableOps/tableImport/ImportTableTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/upgrade/RootFilesUpgradeTest.java b/server/manager/src/test/java/org/apache/accumulo/master/upgrade/RootFilesUpgradeTest.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/upgrade/RootFilesUpgradeTest.java rename to server/manager/src/test/java/org/apache/accumulo/master/upgrade/RootFilesUpgradeTest.java diff --git a/server/master/src/test/java/org/apache/accumulo/master/upgrade/Upgrader9to10Test.java b/server/manager/src/test/java/org/apache/accumulo/master/upgrade/Upgrader9to10Test.java similarity index 100% rename from server/master/src/test/java/org/apache/accumulo/master/upgrade/Upgrader9to10Test.java rename to server/manager/src/test/java/org/apache/accumulo/master/upgrade/Upgrader9to10Test.java diff --git a/server/master/src/test/resources/accumulo.properties b/server/manager/src/test/resources/accumulo.properties similarity index 100% rename from server/master/src/test/resources/accumulo.properties rename to server/manager/src/test/resources/accumulo.properties diff --git a/server/master/src/test/resources/conf/accumulo-site.xml b/server/manager/src/test/resources/conf/accumulo-site.xml similarity index 100% rename from server/master/src/test/resources/conf/accumulo-site.xml rename to server/manager/src/test/resources/conf/accumulo-site.xml diff --git a/server/master/src/test/resources/conf/generic_logger.xml b/server/manager/src/test/resources/conf/generic_logger.xml similarity index 100% rename from server/master/src/test/resources/conf/generic_logger.xml rename to server/manager/src/test/resources/conf/generic_logger.xml diff --git a/server/master/src/test/resources/conf/monitor_logger.xml b/server/manager/src/test/resources/conf/monitor_logger.xml similarity index 100% rename from server/master/src/test/resources/conf/monitor_logger.xml rename to server/manager/src/test/resources/conf/monitor_logger.xml diff --git a/server/master/src/test/resources/hadoop-metrics2-accumulo.properties b/server/manager/src/test/resources/hadoop-metrics2-accumulo.properties similarity index 100% rename from server/master/src/test/resources/hadoop-metrics2-accumulo.properties rename to server/manager/src/test/resources/hadoop-metrics2-accumulo.properties diff --git a/server/master/src/test/resources/log4j2-test.properties b/server/manager/src/test/resources/log4j2-test.properties similarity index 100% rename from server/master/src/test/resources/log4j2-test.properties rename to server/manager/src/test/resources/log4j2-test.properties diff --git a/test/pom.xml b/test/pom.xml index b516636..b11a690 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-master</artifactId> + <artifactId>accumulo-manager</artifactId> </dependency> <dependency> <groupId>org.apache.accumulo</groupId>
