You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2021/05/13 01:56:05 UTC
[geode] branch develop updated: Resolving package split for
geode-management (#6451)
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 35f1696 Resolving package split for geode-management (#6451)
35f1696 is described below
commit 35f1696ab1fbd9d4aabb91eeabb7a7807eb394b8
Author: Udo Kohlmeyer <ko...@users.noreply.github.com>
AuthorDate: Thu May 13 11:54:51 2021 +1000
Resolving package split for geode-management (#6451)
Co-authored-by: Udo Kohlmeyer <ud...@vmware.com>
Co-authored-by: Patrick Johnson <jp...@vmware.com>
---
buildSrc/src/main/resources/japicmp_exceptions.json | 3 ++-
.../acceptanceTest/resources/ManagementClientCreateRegion.java | 2 +-
.../apache/geode/management/JQFilterVerificationDUnitTest.java | 2 +-
.../client/ClusterManagementServiceBuilderDUnitTest.java | 1 +
.../client/CreateRegionWithDiskstoreAndSecurityDUnitTest.java | 1 +
.../management/internal/rest/ClientClusterManagementSSLTest.java | 2 +-
.../internal/rest/ClientClusterManagementServiceDunitTest.java | 2 +-
.../management/internal/rest/DeployToMultiGroupDUnitTest.java | 2 +-
.../management/internal/rest/DeploymentManagementDUnitTest.java | 2 +-
.../internal/rest/DeploymentManagementRedployDUnitTest.java | 2 +-
.../internal/rest/DeploymentSemanticVersionJarDUnitTest.java | 2 +-
.../internal/rest/GatewayReceiverManagementDUnitTest.java | 2 +-
.../management/internal/rest/ListIndexManagementDUnitTest.java | 2 +-
.../management/internal/rest/ListIndexOnPartitionRegionTest.java | 2 +-
.../management/internal/rest/ListRegionManagementDunitTest.java | 2 +-
.../internal/rest/ManagementRequestLoggingDistributedTest.java | 2 +-
.../internal/rest/MemberManagementServiceDunitTest.java | 2 +-
.../management/internal/rest/RebalanceManagementDunitTest.java | 2 +-
.../geode/management/internal/rest/RegionManagementDunitTest.java | 2 +-
.../internal/rest/RestoreRedundancyManagementDUnitTest.java | 2 +-
.../apache/geode/management/internal/rest/ServerRestartTest.java | 2 +-
.../rest/controllers/ClusterManagementRestLoggingTest.java | 2 +-
.../rest/internal/web/ManagementRestAuthTokenIntegrationTest.java | 2 +-
geode-assembly/src/integrationTest/resources/assembly_content.txt | 8 ++++----
.../apache/geode/management/DeploymentManagementUpgradeTest.java | 2 +-
.../apache/geode/management/OperationManagementUpgradeTest.java | 2 +-
.../java/org/apache/geode/internal/config/VersionAdapter.java | 0
.../management/builder/GeodeClusterManagementServiceBuilder.java | 2 +-
.../geode/management/internal/api/GeodeConnectionConfig.java | 2 +-
.../java/org/apache/geode/management/api/ConnectionConfig.java | 2 +-
.../api/RestTemplateClusterManagementServiceTransport.java | 4 ++--
.../{ => cluster}/client/ClusterManagementServiceBuilder.java | 4 ++--
.../client}/internal/ClientClusterManagementService.java | 2 +-
.../apache/geode/management/internal/{ => dormant}/Dormant.java | 2 +-
.../apache/geode/management/{ => rest}/internal/Constants.java | 2 +-
.../internal/exception}/RestTemplateResponseErrorHandler.java | 2 +-
.../{ => service}/internal/api/BaseManagementServiceBuilder.java | 4 ++--
.../management/client/ClusterManagementServiceBuilderTest.java | 1 +
.../management/internal/ClientClusterManagementServiceTest.java | 1 +
.../client/ClientClusterManagementServiceDUnitTest.java | 1 +
.../org/apache/geode/management/client/ConfigurePDXDUnitTest.java | 1 +
.../apache/geode/management/client/CreateDiskStoreDUnitTest.java | 1 +
.../org/apache/geode/management/client/GetStartingMemberTest.java | 1 +
.../geode/management/client/MemberManagementServiceDUnitTest.java | 1 +
.../management/internal/rest/DeployManagementIntegrationTest.java | 2 +-
.../internal/rest/DiskStoreManagementIntegrationTest.java | 2 +-
.../internal/rest/GatewayManagementIntegrationTest.java | 2 +-
.../geode/management/internal/rest/HateoasIntegrationTest.java | 2 +-
.../geode/management/internal/rest/RebalanceIntegrationTest.java | 2 +-
.../management/internal/rest/RegionManagementIntegrationTest.java | 2 +-
.../rest/RestoreRedundancyRequestControllerIntegrationTest.java | 2 +-
.../internal/rest/controllers/ManagementControllerAdvice.java | 2 +-
52 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/buildSrc/src/main/resources/japicmp_exceptions.json b/buildSrc/src/main/resources/japicmp_exceptions.json
index a48ffe7..474e143 100755
--- a/buildSrc/src/main/resources/japicmp_exceptions.json
+++ b/buildSrc/src/main/resources/japicmp_exceptions.json
@@ -3,5 +3,6 @@
"Method org.apache.geode.net.SSLParameterExtension.init(org.apache.geode.distributed.internal.DistributionConfig)": "Old implementation exposed an internal class",
"Class org.apache.geode.cache.execute.FunctionContext": "Interface not intended for client applications",
"Method org.apache.geode.cache.execute.FunctionContext.getPrincipal()": "Interface not intended for client applications",
- "Class org.apache.geode.distributed.ConfigurationProperties" : "Geode API compatible with Redis is experimental and is subject to change in future releases"
+ "Class org.apache.geode.distributed.ConfigurationProperties" : "Geode API compatible with Redis is experimental and is subject to change in future releases",
+ "Class org.apache.geode.management.builder.GeodeClusterManagementServiceBuilder": "Moved internal class to fix split packages between geode-core and geode-management"
}
diff --git a/geode-assembly/src/acceptanceTest/resources/ManagementClientCreateRegion.java b/geode-assembly/src/acceptanceTest/resources/ManagementClientCreateRegion.java
index e89eb6e..c18581d 100644
--- a/geode-assembly/src/acceptanceTest/resources/ManagementClientCreateRegion.java
+++ b/geode-assembly/src/acceptanceTest/resources/ManagementClientCreateRegion.java
@@ -17,7 +17,7 @@ import javax.net.ssl.SSLContext;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java
index 35590b1..f977cd1 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/JQFilterVerificationDUnitTest.java
@@ -37,7 +37,7 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.DiskDir;
import org.apache.geode.management.configuration.DiskStore;
import org.apache.geode.management.configuration.Index;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/ClusterManagementServiceBuilderDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/ClusterManagementServiceBuilderDUnitTest.java
index 5783fb1..fcc3afd 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/ClusterManagementServiceBuilderDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/ClusterManagementServiceBuilderDUnitTest.java
@@ -25,6 +25,7 @@ import org.springframework.web.client.RestTemplate;
import org.apache.geode.management.api.ConnectionConfig;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.rules.MemberStarterRule;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/CreateRegionWithDiskstoreAndSecurityDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/CreateRegionWithDiskstoreAndSecurityDUnitTest.java
index 61c9329..30bb9da 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/CreateRegionWithDiskstoreAndSecurityDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/client/CreateRegionWithDiskstoreAndSecurityDUnitTest.java
@@ -28,6 +28,7 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementSSLTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementSSLTest.java
index cebd0be..8d7ffcc 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementSSLTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementSSLTest.java
@@ -45,7 +45,7 @@ import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
import org.apache.geode.management.builder.GeodeClusterManagementServiceBuilder;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementServiceDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementServiceDunitTest.java
index a612844..e903a17 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementServiceDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClientClusterManagementServiceDunitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
import org.apache.geode.management.builder.GeodeClusterManagementServiceBuilder;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.test.dunit.rules.ClientVM;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeployToMultiGroupDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeployToMultiGroupDUnitTest.java
index af83f93..7bc38b3 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeployToMultiGroupDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeployToMultiGroupDUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.management.api.ClusterManagementGetResult;
import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementRealizationResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Deployment;
import org.apache.geode.management.runtime.DeploymentInfo;
import org.apache.geode.test.compiler.JarBuilder;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementDUnitTest.java
index e78b589..590912d 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementDUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.api.ClusterManagementGetResult;
import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Deployment;
import org.apache.geode.management.runtime.DeploymentInfo;
import org.apache.geode.test.compiler.JarBuilder;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementRedployDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementRedployDUnitTest.java
index 44e37e6..0387c32 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementRedployDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentManagementRedployDUnitTest.java
@@ -45,7 +45,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.classloader.ClassPathLoader;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Deployment;
import org.apache.geode.test.compiler.ClassBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentSemanticVersionJarDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentSemanticVersionJarDUnitTest.java
index c1ac6ca..8e2fb5d 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentSemanticVersionJarDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/DeploymentSemanticVersionJarDUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.distributed.internal.InternalConfigurationPersistenceSer
import org.apache.geode.internal.classloader.ClassPathLoader;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Deployment;
import org.apache.geode.management.runtime.DeploymentInfo;
import org.apache.geode.test.compiler.JarBuilder;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/GatewayReceiverManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/GatewayReceiverManagementDUnitTest.java
index 1b8f9a5..3526f69 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/GatewayReceiverManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/GatewayReceiverManagementDUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.EntityGroupInfo;
import org.apache.geode.management.api.RealizationResult;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.GatewayReceiver;
import org.apache.geode.management.runtime.GatewayReceiverInfo;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
index 09e5ad5..887a818 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexManagementDUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementRealizationResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.EntityGroupInfo;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Index;
import org.apache.geode.management.configuration.IndexType;
import org.apache.geode.management.configuration.Region;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexOnPartitionRegionTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexOnPartitionRegionTest.java
index ed25347..4e9a7a3 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexOnPartitionRegionTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListIndexOnPartitionRegionTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.distributed.internal.InternalConfigurationPersistenceSer
import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementRealizationResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Index;
import org.apache.geode.management.configuration.IndexType;
import org.apache.geode.management.configuration.Region;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListRegionManagementDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListRegionManagementDunitTest.java
index e7e5b96..115fe5f 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListRegionManagementDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ListRegionManagementDunitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.EntityInfo;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.AbstractConfiguration;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ManagementRequestLoggingDistributedTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ManagementRequestLoggingDistributedTest.java
index da883fb..ced8c8b 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ManagementRequestLoggingDistributedTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ManagementRequestLoggingDistributedTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.distributed.LocatorLauncher;
import org.apache.geode.distributed.ServerLauncher;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/MemberManagementServiceDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/MemberManagementServiceDunitTest.java
index 285f037..dfb71b2 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/MemberManagementServiceDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/MemberManagementServiceDunitTest.java
@@ -26,7 +26,7 @@ import org.apache.geode.management.api.ClusterManagementGetResult;
import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Member;
import org.apache.geode.management.runtime.MemberInformation;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
index b187a24..5808b7e 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RebalanceManagementDunitTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.apache.geode.management.api.ClusterManagementListOperationsResult;
import org.apache.geode.management.api.ClusterManagementOperationResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.management.operation.RebalanceOperation;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java
index 0f747b2..33443a2 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.management.api.ClusterManagementRealizationResult;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.test.dunit.IgnoredException;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
index 76b2a42..aa00799 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.cache.PartitionAttributesImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.management.api.ClusterManagementOperationResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.operation.RestoreRedundancyRequest;
import org.apache.geode.management.runtime.RegionRedundancyStatus;
import org.apache.geode.management.runtime.RestoreRedundancyResults;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ServerRestartTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ServerRestartTest.java
index 9b2f237..a9e3b22 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ServerRestartTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ServerRestartTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/controllers/ClusterManagementRestLoggingTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/controllers/ClusterManagementRestLoggingTest.java
index d8faab3..d888ce5 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/controllers/ClusterManagementRestLoggingTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/rest/controllers/ClusterManagementRestLoggingTest.java
@@ -22,7 +22,7 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
public class ClusterManagementRestLoggingTest {
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/ManagementRestAuthTokenIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/ManagementRestAuthTokenIntegrationTest.java
index a2b36e4..476e3be 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/ManagementRestAuthTokenIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/ManagementRestAuthTokenIntegrationTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
public class ManagementRestAuthTokenIntegrationTest {
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 76a6dd3..5168be3 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -722,10 +722,10 @@ javadoc/org/apache/geode/management/cli/UpdateAllConfigurationGroupsMarker.html
javadoc/org/apache/geode/management/cli/package-frame.html
javadoc/org/apache/geode/management/cli/package-summary.html
javadoc/org/apache/geode/management/cli/package-tree.html
-javadoc/org/apache/geode/management/client/ClusterManagementServiceBuilder.html
-javadoc/org/apache/geode/management/client/package-frame.html
-javadoc/org/apache/geode/management/client/package-summary.html
-javadoc/org/apache/geode/management/client/package-tree.html
+javadoc/org/apache/geode/management/cluster/client/ClusterManagementServiceBuilder.html
+javadoc/org/apache/geode/management/cluster/client/package-frame.html
+javadoc/org/apache/geode/management/cluster/client/package-summary.html
+javadoc/org/apache/geode/management/cluster/client/package-tree.html
javadoc/org/apache/geode/management/configuration/AbstractConfiguration.html
javadoc/org/apache/geode/management/configuration/AutoSerializer.html
javadoc/org/apache/geode/management/configuration/ClassName.html
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/management/DeploymentManagementUpgradeTest.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/management/DeploymentManagementUpgradeTest.java
index 1b98213..1ed3ebc 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/management/DeploymentManagementUpgradeTest.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/management/DeploymentManagementUpgradeTest.java
@@ -34,7 +34,7 @@ import org.junit.runners.Parameterized;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Deployment;
import org.apache.geode.test.compiler.JarBuilder;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/management/OperationManagementUpgradeTest.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/management/OperationManagementUpgradeTest.java
index 6121a50..71533ec 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/management/OperationManagementUpgradeTest.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/management/OperationManagementUpgradeTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.api.ClusterManagementOperationResult;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.operation.RebalanceOperation;
import org.apache.geode.management.runtime.RebalanceResult;
import org.apache.geode.test.dunit.VM;
diff --git a/geode-management/src/main/java/org/apache/geode/internal/config/VersionAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/config/VersionAdapter.java
similarity index 100%
rename from geode-management/src/main/java/org/apache/geode/internal/config/VersionAdapter.java
rename to geode-core/src/main/java/org/apache/geode/internal/config/VersionAdapter.java
diff --git a/geode-core/src/main/java/org/apache/geode/management/builder/GeodeClusterManagementServiceBuilder.java b/geode-core/src/main/java/org/apache/geode/management/builder/GeodeClusterManagementServiceBuilder.java
index 8afde8a..ab42d3c 100644
--- a/geode-core/src/main/java/org/apache/geode/management/builder/GeodeClusterManagementServiceBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/builder/GeodeClusterManagementServiceBuilder.java
@@ -18,8 +18,8 @@ package org.apache.geode.management.builder;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.management.api.ConnectionConfig;
-import org.apache.geode.management.internal.api.BaseManagementServiceBuilder;
import org.apache.geode.management.internal.api.GeodeConnectionConfig;
+import org.apache.geode.management.service.internal.api.BaseManagementServiceBuilder;
public class GeodeClusterManagementServiceBuilder
extends BaseManagementServiceBuilder<GeodeClusterManagementServiceBuilder> {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java b/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
index 5bc770c..a1b2c62 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/api/GeodeConnectionConfig.java
@@ -46,7 +46,7 @@ import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.management.api.ConnectionConfig;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.internal.configuration.messages.ClusterManagementServiceInfo;
import org.apache.geode.management.internal.configuration.messages.ClusterManagementServiceInfoRequest;
import org.apache.geode.management.internal.functions.GetMemberInformationFunction;
diff --git a/geode-management/src/main/java/org/apache/geode/management/api/ConnectionConfig.java b/geode-management/src/main/java/org/apache/geode/management/api/ConnectionConfig.java
index af07d2d..c8ae55c 100644
--- a/geode-management/src/main/java/org/apache/geode/management/api/ConnectionConfig.java
+++ b/geode-management/src/main/java/org/apache/geode/management/api/ConnectionConfig.java
@@ -22,7 +22,7 @@ import javax.net.ssl.SSLContext;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
/**
* Concrete implementation of {@link ConnectionConfig} which can be used where the various
diff --git a/geode-management/src/main/java/org/apache/geode/management/api/RestTemplateClusterManagementServiceTransport.java b/geode-management/src/main/java/org/apache/geode/management/api/RestTemplateClusterManagementServiceTransport.java
index 3694274..91af45d 100644
--- a/geode-management/src/main/java/org/apache/geode/management/api/RestTemplateClusterManagementServiceTransport.java
+++ b/geode-management/src/main/java/org/apache/geode/management/api/RestTemplateClusterManagementServiceTransport.java
@@ -17,7 +17,7 @@
package org.apache.geode.management.api;
import static org.apache.geode.management.configuration.Links.URI_VERSION;
-import static org.apache.geode.management.internal.Constants.INCLUDE_CLASS_HEADER;
+import static org.apache.geode.management.rest.internal.Constants.INCLUDE_CLASS_HEADER;
import java.io.File;
import java.nio.charset.StandardCharsets;
@@ -51,7 +51,7 @@ import org.springframework.web.util.DefaultUriBuilderFactory;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.management.configuration.AbstractConfiguration;
import org.apache.geode.management.configuration.HasFile;
-import org.apache.geode.management.internal.RestTemplateResponseErrorHandler;
+import org.apache.geode.management.rest.internal.exception.RestTemplateResponseErrorHandler;
import org.apache.geode.management.runtime.OperationResult;
import org.apache.geode.management.runtime.RuntimeInfo;
import org.apache.geode.util.internal.GeodeJsonMapper;
diff --git a/geode-management/src/main/java/org/apache/geode/management/client/ClusterManagementServiceBuilder.java b/geode-management/src/main/java/org/apache/geode/management/cluster/client/ClusterManagementServiceBuilder.java
similarity index 94%
rename from geode-management/src/main/java/org/apache/geode/management/client/ClusterManagementServiceBuilder.java
rename to geode-management/src/main/java/org/apache/geode/management/cluster/client/ClusterManagementServiceBuilder.java
index 01fc923..ed6193b 100644
--- a/geode-management/src/main/java/org/apache/geode/management/client/ClusterManagementServiceBuilder.java
+++ b/geode-management/src/main/java/org/apache/geode/management/cluster/client/ClusterManagementServiceBuilder.java
@@ -14,13 +14,13 @@
*
*/
-package org.apache.geode.management.client;
+package org.apache.geode.management.cluster.client;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.management.api.ClusterManagementServiceTransport;
import org.apache.geode.management.api.ConnectionConfig;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.internal.api.BaseManagementServiceBuilder;
+import org.apache.geode.management.service.internal.api.BaseManagementServiceBuilder;
/**
* This builder facilitates creating a ClusterManagementService using either (or both) a {@link
diff --git a/geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java b/geode-management/src/main/java/org/apache/geode/management/cluster/client/internal/ClientClusterManagementService.java
similarity index 99%
rename from geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java
rename to geode-management/src/main/java/org/apache/geode/management/cluster/client/internal/ClientClusterManagementService.java
index 1887675..1508bfc 100644
--- a/geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java
+++ b/geode-management/src/main/java/org/apache/geode/management/cluster/client/internal/ClientClusterManagementService.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.geode.management.internal;
+package org.apache.geode.management.cluster.client.internal;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
diff --git a/geode-management/src/main/java/org/apache/geode/management/internal/Dormant.java b/geode-management/src/main/java/org/apache/geode/management/internal/dormant/Dormant.java
similarity index 94%
rename from geode-management/src/main/java/org/apache/geode/management/internal/Dormant.java
rename to geode-management/src/main/java/org/apache/geode/management/internal/dormant/Dormant.java
index cd5561e..7c0a206 100644
--- a/geode-management/src/main/java/org/apache/geode/management/internal/Dormant.java
+++ b/geode-management/src/main/java/org/apache/geode/management/internal/dormant/Dormant.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.geode.management.internal;
+package org.apache.geode.management.internal.dormant;
/**
* lazy-initialization interface
diff --git a/geode-management/src/main/java/org/apache/geode/management/internal/Constants.java b/geode-management/src/main/java/org/apache/geode/management/rest/internal/Constants.java
similarity index 95%
rename from geode-management/src/main/java/org/apache/geode/management/internal/Constants.java
rename to geode-management/src/main/java/org/apache/geode/management/rest/internal/Constants.java
index 4da025c..9d86201 100644
--- a/geode-management/src/main/java/org/apache/geode/management/internal/Constants.java
+++ b/geode-management/src/main/java/org/apache/geode/management/rest/internal/Constants.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.geode.management.internal;
+package org.apache.geode.management.rest.internal;
public interface Constants {
/**
diff --git a/geode-management/src/main/java/org/apache/geode/management/internal/RestTemplateResponseErrorHandler.java b/geode-management/src/main/java/org/apache/geode/management/rest/internal/exception/RestTemplateResponseErrorHandler.java
similarity index 95%
rename from geode-management/src/main/java/org/apache/geode/management/internal/RestTemplateResponseErrorHandler.java
rename to geode-management/src/main/java/org/apache/geode/management/rest/internal/exception/RestTemplateResponseErrorHandler.java
index ef3272a..ef0b991 100644
--- a/geode-management/src/main/java/org/apache/geode/management/internal/RestTemplateResponseErrorHandler.java
+++ b/geode-management/src/main/java/org/apache/geode/management/rest/internal/exception/RestTemplateResponseErrorHandler.java
@@ -13,7 +13,7 @@
* the License.
*/
-package org.apache.geode.management.internal;
+package org.apache.geode.management.rest.internal.exception;
import java.io.IOException;
diff --git a/geode-management/src/main/java/org/apache/geode/management/internal/api/BaseManagementServiceBuilder.java b/geode-management/src/main/java/org/apache/geode/management/service/internal/api/BaseManagementServiceBuilder.java
similarity index 96%
rename from geode-management/src/main/java/org/apache/geode/management/internal/api/BaseManagementServiceBuilder.java
rename to geode-management/src/main/java/org/apache/geode/management/service/internal/api/BaseManagementServiceBuilder.java
index 0c9b9e0..f8ae419 100644
--- a/geode-management/src/main/java/org/apache/geode/management/internal/api/BaseManagementServiceBuilder.java
+++ b/geode-management/src/main/java/org/apache/geode/management/service/internal/api/BaseManagementServiceBuilder.java
@@ -13,7 +13,7 @@
* the License.
*
*/
-package org.apache.geode.management.internal.api;
+package org.apache.geode.management.service.internal.api;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -22,7 +22,7 @@ import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.ClusterManagementServiceTransport;
import org.apache.geode.management.api.ConnectionConfig;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.internal.ClientClusterManagementService;
+import org.apache.geode.management.cluster.client.internal.ClientClusterManagementService;
public abstract class BaseManagementServiceBuilder<T extends BaseManagementServiceBuilder<?>> {
diff --git a/geode-management/src/test/java/org/apache/geode/management/client/ClusterManagementServiceBuilderTest.java b/geode-management/src/test/java/org/apache/geode/management/client/ClusterManagementServiceBuilderTest.java
index 45d72ad..e0cef25 100644
--- a/geode-management/src/test/java/org/apache/geode/management/client/ClusterManagementServiceBuilderTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/client/ClusterManagementServiceBuilderTest.java
@@ -33,6 +33,7 @@ import org.springframework.util.ReflectionUtils;
import org.springframework.web.client.RestTemplate;
import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
public class ClusterManagementServiceBuilderTest {
diff --git a/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java b/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
index ab7c216..1044447 100644
--- a/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
+++ b/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
@@ -43,6 +43,7 @@ import org.apache.geode.management.api.ClusterManagementOperationResult;
import org.apache.geode.management.api.ClusterManagementRealizationResult;
import org.apache.geode.management.api.ClusterManagementServiceTransport;
import org.apache.geode.management.api.CommandType;
+import org.apache.geode.management.cluster.client.internal.ClientClusterManagementService;
import org.apache.geode.management.configuration.AbstractConfiguration;
import org.apache.geode.management.operation.RebalanceOperation;
import org.apache.geode.management.runtime.OperationResult;
diff --git a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ClientClusterManagementServiceDUnitTest.java b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ClientClusterManagementServiceDUnitTest.java
index 45fcd54..72ad6da 100644
--- a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ClientClusterManagementServiceDUnitTest.java
+++ b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ClientClusterManagementServiceDUnitTest.java
@@ -42,6 +42,7 @@ import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
import org.apache.geode.management.internal.rest.LocatorWebContext;
diff --git a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ConfigurePDXDUnitTest.java b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ConfigurePDXDUnitTest.java
index cd03066..088d634 100644
--- a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ConfigurePDXDUnitTest.java
+++ b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/ConfigurePDXDUnitTest.java
@@ -45,6 +45,7 @@ import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Pdx;
import org.apache.geode.management.internal.rest.LocatorWebContext;
import org.apache.geode.management.internal.rest.PlainLocatorContextLoader;
diff --git a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
index 334e2f2..5e37045 100644
--- a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
+++ b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
@@ -49,6 +49,7 @@ import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RealizationResult;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.DiskDir;
import org.apache.geode.management.configuration.DiskStore;
import org.apache.geode.management.configuration.Region;
diff --git a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/GetStartingMemberTest.java b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/GetStartingMemberTest.java
index 8fbd3bf..fdfbc02 100644
--- a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/GetStartingMemberTest.java
+++ b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/GetStartingMemberTest.java
@@ -39,6 +39,7 @@ import org.apache.geode.management.api.ClusterManagementException;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Member;
import org.apache.geode.management.internal.rest.LocatorWebContext;
import org.apache.geode.management.internal.rest.PlainLocatorContextLoader;
diff --git a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/MemberManagementServiceDUnitTest.java b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/MemberManagementServiceDUnitTest.java
index bf4b4ed..4e27182 100644
--- a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/MemberManagementServiceDUnitTest.java
+++ b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/MemberManagementServiceDUnitTest.java
@@ -42,6 +42,7 @@ import org.apache.geode.management.api.ClusterManagementListResult;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Member;
import org.apache.geode.management.internal.rest.LocatorLauncherContextLoader;
import org.apache.geode.management.internal.rest.LocatorWebContext;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DeployManagementIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DeployManagementIntegrationTest.java
index 0be575e..2aecb03 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DeployManagementIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DeployManagementIntegrationTest.java
@@ -40,7 +40,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.EntityInfo;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Deployment;
import org.apache.geode.management.runtime.DeploymentInfo;
import org.apache.geode.test.compiler.JarBuilder;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DiskStoreManagementIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DiskStoreManagementIntegrationTest.java
index 0623589..eb076e6 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DiskStoreManagementIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/DiskStoreManagementIntegrationTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.management.api.ClusterManagementGetResult;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.DiskDir;
import org.apache.geode.management.configuration.DiskStore;
import org.apache.geode.management.runtime.DiskStoreInfo;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/GatewayManagementIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/GatewayManagementIntegrationTest.java
index 5d5300e..0fdc8d7 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/GatewayManagementIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/GatewayManagementIntegrationTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.EntityGroupInfo;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.ClassName;
import org.apache.geode.management.configuration.GatewayReceiver;
import org.apache.geode.management.runtime.GatewayReceiverInfo;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/HateoasIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/HateoasIntegrationTest.java
index 1d29e34..93a1197 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/HateoasIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/HateoasIntegrationTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.management.api.ClusterManagementException;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Region;
import org.apache.geode.management.configuration.RegionType;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RebalanceIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RebalanceIntegrationTest.java
index 3a762d6..c183865 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RebalanceIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RebalanceIntegrationTest.java
@@ -45,7 +45,7 @@ import org.apache.geode.management.api.ClusterManagementOperationResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.ClusterManagementServiceTransport;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.operation.RebalanceOperation;
import org.apache.geode.management.runtime.RebalanceResult;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java
index e65c880..b670672 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java
@@ -44,7 +44,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.configuration.Index;
import org.apache.geode.management.configuration.IndexType;
import org.apache.geode.management.configuration.Region;
diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyRequestControllerIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyRequestControllerIntegrationTest.java
index 0a43052..fbd87e9 100644
--- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyRequestControllerIntegrationTest.java
+++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyRequestControllerIntegrationTest.java
@@ -47,7 +47,7 @@ import org.apache.geode.management.api.ClusterManagementOperationResult;
import org.apache.geode.management.api.ClusterManagementService;
import org.apache.geode.management.api.ClusterManagementServiceTransport;
import org.apache.geode.management.api.RestTemplateClusterManagementServiceTransport;
-import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.cluster.client.ClusterManagementServiceBuilder;
import org.apache.geode.management.operation.RestoreRedundancyRequest;
import org.apache.geode.management.runtime.RestoreRedundancyResults;
diff --git a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/ManagementControllerAdvice.java b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/ManagementControllerAdvice.java
index e216372..d29833d 100644
--- a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/ManagementControllerAdvice.java
+++ b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/ManagementControllerAdvice.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.management.internal.rest.controllers;
-import static org.apache.geode.management.internal.Constants.INCLUDE_CLASS_HEADER;
+import static org.apache.geode.management.rest.internal.Constants.INCLUDE_CLASS_HEADER;
import java.util.List;