This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7119 in repository https://gitbox.apache.org/repos/asf/geode.git.
from 9694909 GEODE-7119 Version ordinal constants are byte but should be short add bf00bf1 GEODE-7078: rename config to configuration (#3981) add 46debcf Revert "GEODE-6805: Allow shorthand ~ to represent user home in jar deployment. (#3927)" add b6e7b07 GEODE-6941: move xml configuration objects to core (#3978) add ffe0fc6 GEODE-7140: Rename the meters for entries add c306d01 GEODE-7139: Cleanup the common tags on the meters add 577f0b2 GEODE:7141 Rename meter 'cache.gatewayreceiver.events.received' add 576e33b GEODE-6941: clean out xml traces in geode-management (#3987) add ec74aee Revert "Add 1.9.1 to Version list" add 12f11c9 Revert "Add 1.9.1 to Version list" add 468699b Merge branch 'develop' into feature/GEODE-7119 No new revisions were added by this update. Summary of changes: .../geode/test/junit/rules/HttpResponseAssert.java | 6 ++-- .../geode/metrics/GatewayReceiverMetricsTest.java | 2 +- .../geode/metrics/RegionEntriesGaugeTest.java | 4 +-- .../resources/ManagementClientCreateRegion.java | 2 +- ...ateRegionWithDiskstoreAndSecurityDUnitTest.java | 2 +- .../rest/ClientClusterManagementSSLTest.java | 6 ++-- .../ClientClusterManagementServiceDunitTest.java | 8 ++--- ...ClusterManagementLocatorReconnectDunitTest.java | 6 ++-- .../rest/ClusterManagementServiceOnServerTest.java | 2 +- .../rest/GatewayReceiverManagementDUnitTest.java | 4 +-- .../rest/ListIndexManagementDUnitTest.java | 2 +- .../rest/ListRegionManagementDunitTest.java | 25 ++++++------- .../rest/ManagementRequestLoggingDUnitTest.java | 2 +- .../rest/RebalanceManagementDunitTest.java | 2 +- .../internal/rest/RegionManagementDunitTest.java | 6 ++-- .../internal/rest/ServerRestartTest.java | 2 +- .../integrationTest/resources/assembly_content.txt | 5 +-- .../java/org/apache/geode/lang/Identifiable.java | 12 +++++++ .../jdbc/internal/cli/CreateDataSourceCommand.java | 5 +-- .../internal/cli/DestroyDataSourceCommand.java | 7 ++-- .../internal/CacheConfigDAODUnitTest.java | 2 +- .../internal/api/RegionAPIDUnitTest.java | 6 ++-- .../cli/commands/AlterRegionCommandDUnitTest.java | 6 ++-- .../cli/commands/CreateRegionCommandDUnitTest.java | 16 ++++----- ...egionCommandPersistsConfigurationDUnitTest.java | 34 +++++++++--------- .../RegionConfigMutatorIntegrationTest.java | 6 ++-- .../RegionConfigRealizerIntegrationTest.java | 2 +- .../geode/cache/configuration/CacheConfig.java | 28 +++++++-------- .../geode/cache/configuration/CacheElement.java | 23 +++--------- .../configuration/CacheTransactionManagerType.java | 20 +++++------ .../geode/cache/configuration/ClassNameType.java | 20 +++++------ .../geode/cache/configuration/DeclarableType.java | 24 ++++++------- .../geode/cache/configuration/DiskDirType.java | 20 +++++------ .../geode/cache/configuration/DiskDirsType.java | 20 +++++------ .../geode/cache/configuration/DiskStoreType.java | 21 +++++------ .../configuration/DynamicRegionFactoryType.java | 20 +++++------ .../configuration/EnumActionDestroyOverflow.java | 20 +++++------ .../cache/configuration/EnumReadableWritable.java | 20 +++++------ .../cache/configuration/FunctionServiceType.java | 20 +++++------ .../cache/configuration/GatewayReceiverConfig.java | 0 .../cache/configuration/JndiBindingsType.java | 20 +++++------ .../geode/cache/configuration/ObjectType.java | 20 +++++------ .../geode/cache/configuration/ParameterType.java | 20 +++++------ .../apache/geode/cache/configuration/PdxType.java | 20 +++++------ .../apache/geode/cache/configuration/PoolType.java | 20 +++++------ .../configuration/RegionAttributesDataPolicy.java | 20 +++++------ .../RegionAttributesIndexUpdateType.java | 20 +++++------ .../configuration/RegionAttributesMirrorType.java | 20 +++++------ .../cache/configuration/RegionAttributesScope.java | 20 +++++------ .../cache/configuration/RegionAttributesType.java | 32 ++++++++--------- .../geode/cache/configuration/RegionConfig.java | 27 ++++++-------- .../cache/configuration/ResourceManagerType.java | 20 +++++------ .../SerializationRegistrationType.java | 20 +++++------ .../geode/cache/configuration/ServerType.java | 20 +++++------ .../geode/cache/configuration/XSDRootElement.java | 29 ++++++--------- .../geode/cache/configuration/package-info.java | 28 ++++----------- .../java/org/apache/geode/internal/Version.java | 7 +--- .../geode/internal/cache/RegionPerfStats.java | 4 +-- .../cache/tier/sockets/CommandInitializer.java | 1 - .../internal/cache/wan/GatewayReceiverStats.java | 2 +- .../metrics/CacheMeterRegistryFactory.java | 6 ++-- .../api/LocatorClusterManagementService.java | 17 ++++----- .../geode/management/internal/cli/GfshParser.java | 1 - .../cli/commands/AlterAsyncEventQueueCommand.java | 4 +-- .../internal/cli/commands/AlterRegionCommand.java | 7 ++-- .../internal/cli/commands/CreateIndexCommand.java | 2 +- .../cli/commands/CreateJndiBindingCommand.java | 4 +-- .../cli/commands/DestroyDiskStoreCommand.java | 4 +-- .../internal/cli/commands/DestroyIndexCommand.java | 6 ++-- .../cli/commands/DestroyJndiBindingCommand.java | 8 +++-- .../cli/commands/DestroyRegionCommand.java | 10 +++--- .../cli/functions/CacheRealizationFunction.java | 10 +++--- .../configuration/converters/RegionConverter.java | 2 +- .../mutators/ConfigurationManager.java | 4 +-- .../mutators/RegionConfigManager.java | 4 +-- .../realizers/ConfigurationRealizer.java | 6 ++-- .../validators/CacheElementValidator.java | 12 +++---- .../validators/ConfigurationValidator.java | 4 +-- .../configuration/validators/MemberValidator.java | 20 ++++++----- .../validators/RegionConfigValidator.java | 8 ++--- .../sanctioned-geode-core-serializables.txt | 31 ++++++++++++++++ .../sanctioned-geode-management-serializables.txt | 36 ++----------------- .../geode/cache/configuration/CacheConfigTest.java | 1 + .../cache/configuration/DeclarableTypeTest.java | 1 - ...nternalConfigurationPersistenceServiceTest.java | 2 +- .../geode/internal/cache/RegionPerfStatsTest.java | 16 ++++----- .../cache/wan/GatewayReceiverStatsTest.java | 2 +- .../geode/internal/config/JAXBServiceTest.java | 2 +- .../CacheMeterRegistryFactoryBindersTest.java | 2 +- .../metrics/CacheMeterRegistryFactoryTest.java | 6 ++-- .../internal/api/ClusterManagementResultTest.java | 4 +-- .../api/LocatorClusterManagementServiceTest.java | 2 +- .../internal/cli/GfshParserJUnitTest.java | 6 ---- .../internal/cli/commands/DeployCommandTest.java | 18 ---------- .../converters/RegionConverterTest.java | 6 ++-- .../mutators/RegionConfigManagerTest.java | 2 +- .../realizers/RegionConfigRealizerTest.java | 2 +- .../validators/MemberValidatorTest.java | 2 +- .../validators/RegionConfigValidatorTest.java | 2 +- .../ClusterManagementListResultAssert.java | 6 ++-- .../ClusterManagementRealizationResultAssert.java | 2 +- .../sanctioned-geode-lucene-serializables.txt | 2 +- geode-management/build.gradle | 2 -- .../geode/cache/configuration/XSDRootElement.java | 32 ----------------- .../geode/cache/configuration/package-info.java | 25 ------------- .../api/ClusterManagementListResult.java | 7 ++-- .../api/ClusterManagementRealizationException.java | 8 ++--- .../api/ClusterManagementRealizationResult.java | 9 ++--- .../management/api/ClusterManagementService.java | 17 ++++----- .../geode/management/api/ConfigurationResult.java | 18 +++++----- .../geode/management/api/RestfulEndpoint.java | 4 --- .../configuration/AbstractConfiguration.java} | 42 +++++++--------------- .../management/configuration/GatewayReceiver.java | 10 +++--- .../geode/management/configuration/Index.java | 6 ++-- .../management/configuration/MemberConfig.java | 3 +- .../apache/geode/management/configuration/Pdx.java | 4 +-- .../geode/management/configuration/Region.java | 4 +-- .../configuration/RegionType.java | 2 +- .../internal/ClientClusterManagementService.java | 18 +++++----- ...entTest.java => AbstractConfigurationTest.java} | 5 +-- ...Test.java => ConfigurationJsonMappingTest.java} | 4 +-- .../geode/management/configuration/RegionTest.java | 1 - .../src/test/resources/expected-pom.xml | 5 --- .../cli/commands/AlterRegionCommandDUnitTest.java | 18 +++++----- .../ClientClusterManagementServiceDUnitTest.java | 2 +- ...usterManagementSecurityRestIntegrationTest.java | 2 +- .../rest/GatewayManagementIntegrationTest.java | 2 +- .../rest/RegionManagementIntegrationTest.java | 2 +- .../controllers/RegionManagementController.java | 2 +- 129 files changed, 575 insertions(+), 779 deletions(-) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java (99%) copy geode-common/src/main/java/org/apache/geode/lang/Identifiable.java => geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java (58%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java (87%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/ClassNameType.java (78%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java (84%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java (77%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java (79%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java (92%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java (87%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java (72%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java (70%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java (82%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/GatewayReceiverConfig.java (100%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java (97%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/ObjectType.java (82%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/ParameterType.java (82%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/PdxType.java (88%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/PoolType.java (97%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java (77%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java (73%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java (72%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java (73%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java (99%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java (96%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java (86%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java (92%) rename {geode-management => geode-core}/src/main/java/org/apache/geode/cache/configuration/ServerType.java (96%) copy geode-common/src/main/java/org/apache/geode/lang/Identifiable.java => geode-core/src/main/java/org/apache/geode/cache/configuration/XSDRootElement.java (56%) copy geode-common/src/main/java/org/apache/geode/lang/Identifiable.java => geode-core/src/main/java/org/apache/geode/cache/configuration/package-info.java (56%) delete mode 100644 geode-management/src/main/java/org/apache/geode/cache/configuration/XSDRootElement.java delete mode 100644 geode-management/src/main/java/org/apache/geode/cache/configuration/package-info.java rename geode-management/src/main/java/org/apache/geode/{cache/configuration/CacheElement.java => management/configuration/AbstractConfiguration.java} (53%) rename geode-management/src/main/java/org/apache/geode/{cache => management}/configuration/RegionType.java (98%) rename geode-management/src/test/java/org/apache/geode/cache/configuration/{CacheElementTest.java => AbstractConfigurationTest.java} (95%) rename geode-management/src/test/java/org/apache/geode/cache/configuration/{CacheElementJsonMappingTest.java => ConfigurationJsonMappingTest.java} (97%)