diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java index deb8794740b..69634a685b3 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java @@ -34,12 +34,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.data.ResourceGroupId; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.server.util.ZooZap; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java index c88be11aa31..f06f1251e5f 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java @@ -60,7 +60,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.TableNotFoundException; @@ -100,6 +99,7 @@ import org.apache.accumulo.manager.state.SetGoalState; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.init.Initialize; import org.apache.accumulo.server.util.AccumuloStatus; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java index dcdc8a03048..5b38678e789 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.server.cluster; import java.util.Properties; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java index a1e14cfc39d..4b26c53d983 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.server.cluster; import java.io.IOException; import java.util.Map.Entry; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java index 2b7e5426cd6..586088981ef 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.server.cluster; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java similarity index 96% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java index b92f68f6aca..de834774186 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.server.cluster; import org.apache.accumulo.core.security.SystemPermission; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java index 0b6c9190d0e..1a51eff2dd7 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.server.cluster; import static java.util.Objects.requireNonNull; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java similarity index 99% rename from minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java index 79f2ba9eabb..9b24435536e 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.server.cluster; import java.io.BufferedReader; import java.io.IOException; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java index d12409f5072..c22ae9cd59a 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import static com.google.common.base.Preconditions.checkArgument; @@ -29,8 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import org.apache.accumulo.cluster.AccumuloCluster; -import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; @@ -39,8 +37,10 @@ import org.apache.accumulo.core.conf.ConfigurationCopy; import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.server.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.ClusterUser; +import org.apache.accumulo.minicluster.ServerType; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java similarity index 97% rename from minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java index 8e8b852212d..12777ec5e2f 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import static java.util.Objects.requireNonNull; @@ -30,12 +30,10 @@ import java.util.List; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.cluster.RemoteShell; -import org.apache.accumulo.cluster.RemoteShellOptions; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.manager.state.SetGoalState; -import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.server.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.RemoteShell; +import org.apache.accumulo.server.cluster.RemoteShellOptions; import org.apache.accumulo.server.util.adminCommand.StopAll; import org.apache.hadoop.util.Shell.ExitCodeException; import org.slf4j.Logger; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloClusterTest.java similarity index 94% rename from minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java rename to server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloClusterTest.java index 97511c7c369..a9b5ad416f1 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloClusterTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.server.minicluster.ServerType; import org.easymock.EasyMock; import org.junit.jupiter.api.Test; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControlTest.java similarity index 96% rename from minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java rename to server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControlTest.java index 72e56dd64f2..707721bae8b 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControlTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 64ce6e6b740..5f00b612e78 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -38,18 +38,6 @@ ALLOWED=( server/native/src/main/resources/LICENSE server/native/src/main/resources/Makefile server/native/src/main/resources/NOTICE - - # TODO: these minicluster classes should be moved into the correct package for the module - minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java - minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java - minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java - minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java - minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java - minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java - minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java - minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java - minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java - minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java ) ALLOWED_PIPE_SEP=$({ for x in "${ALLOWED[@]}"; do echo "$x"; done; } | paste -sd'|') diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java index 7c6f8f0e510..1f6777c4343 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -50,7 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java index e153c85267d..20612312d53 100644 --- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.SortedSet; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java index f91124245ee..41ee8975ea9 100644 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java @@ -40,7 +40,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java index af45e39cce8..e26525acd65 100644 --- a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java @@ -23,7 +23,7 @@ import java.time.Duration; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; diff --git a/test/src/main/java/org/apache/accumulo/test/UsersIT.java b/test/src/main/java/org/apache/accumulo/test/UsersIT.java index c6ee116909d..4994329bd2c 100644 --- a/test/src/main/java/org/apache/accumulo/test/UsersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UsersIT.java @@ -24,7 +24,7 @@ import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloSecurityException; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java index 3bb57e99695..b83460adcab 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java @@ -33,7 +33,7 @@ import java.util.TreeMap; import java.util.function.Consumer; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java index d6051746f37..400d1d62a9b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java @@ -27,7 +27,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java index ab70614f419..bc911ffdff3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java @@ -39,7 +39,7 @@ import java.util.TreeSet; import java.util.regex.Pattern; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java index a25b55cb8b3..f65e53415f6 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java @@ -29,7 +29,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java index 552fd5b91fc..4e45de53b48 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java @@ -22,7 +22,7 @@ import java.time.Duration; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.test.TestIngest; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java index cf2460035f8..4e79bb2413d 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java index 968d1d5dd4a..83eabd5fe78 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java @@ -38,7 +38,7 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java index 250e0377cdb..2eb0903367b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Scanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java index a5367c218bd..3bafb85346c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java @@ -37,7 +37,7 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java index 004be25a1bb..95daa6e64f1 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java @@ -21,7 +21,7 @@ import java.time.Duration; import java.util.Map; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.ClientProperty; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java index 7a4085680d8..f3875e6c97a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.CloneConfiguration; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java index 9dfe7d05d0c..85d087f253c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java @@ -35,7 +35,7 @@ import java.util.Map.Entry; import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java index a4d4e1f5cb8..202ae6f5d83 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -38,8 +38,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java index 0360aa430a2..9f38e882888 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java @@ -29,7 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java index 7fdaacc0205..f3dd98feedf 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java index c1caae73cc1..135b7dd2c76 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Objects; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java index f0c11a29f96..abd2700b7b2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java @@ -23,7 +23,7 @@ import java.time.Duration; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.start.TestMain; import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java index a21d4fcf0a0..2e631efc623 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java @@ -27,7 +27,7 @@ import java.io.FileNotFoundException; import java.time.Duration; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java index 001201aabc9..30af8347381 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java @@ -26,11 +26,11 @@ import java.io.IOException; import java.util.Properties; -import org.apache.accumulo.cluster.AccumuloCluster; -import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.cluster.ClusterUser; -import org.apache.accumulo.cluster.ClusterUsers; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUsers; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.SecurityOperations; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java index 6780981afc0..53d105238ab 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.Map; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java index 9fa60321098..db4d2f4e151 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.UUID; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java index 11a5ae01d1a..3995f37eabc 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java @@ -32,8 +32,8 @@ import java.util.function.Predicate; import java.util.stream.Stream; -import org.apache.accumulo.cluster.ClusterUser; -import org.apache.accumulo.cluster.ClusterUsers; +import org.apache.accumulo.server.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUsers; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java index 91ebaa8b1c7..1411963fd68 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java index 3e255126586..068cefc3e48 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Properties; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.hadoop.minikdc.MiniKdc; import org.slf4j.Logger; import org.slf4j.LoggerFactory;