This is an automated email from the ASF dual-hosted git repository.
udo pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from dcb1096 GEODE-8886 fix (#6059)
add f2636e0 Revert "GEODE-8905: Introduce JarDeploymentService (#5989)"
(#6078)
No new revisions were added by this update.
Summary of changes:
.../src/test/resources/expected-pom.xml | 38 +-
.../gradle/plugins/DependencyConstraints.groovy | 5 +-
extensions/geode-modules-session/build.gradle | 2 -
extensions/geode-modules/build.gradle | 3 +-
.../src/test/resources/expected-pom.xml | 11 +-
extensions/session-testing-war/build.gradle | 1 -
.../apache/geode/session/tests/TomcatInstall.java | 10 +-
.../geode/modules/DeployJarAcceptanceTest.java | 261 ------------
.../example/test/function/ExampleFunction.java | 37 --
.../example/test/function/PojoFunction.java | 40 --
.../resources/example/test/pojo/ExamplePojo.java | 50 ---
.../internal/rest/DeployToMultiGroupDUnitTest.java | 9 +-
.../rest/DeploymentManagementDUnitTest.java | 22 +-
.../rest/DeploymentManagementRedployDUnitTest.java | 7 +-
.../DeploymentSemanticVersionJarDUnitTest.java | 13 +-
.../integrationTest/resources/assembly_content.txt | 22 +-
.../resources/dependency_classpath.txt | 5 +-
.../cli/CreateDataSourceCommandDUnitTest.java | 1 +
.../CreateMappingPreconditionCheckFunction.java | 2 +-
.../internal/cli/DeregisterDriverFunction.java | 8 +-
.../cli/FunctionContextArgumentProvider.java | 4 +-
.../jdbc/internal/cli/ListDriversFunction.java | 6 +-
.../jdbc/internal/cli/RegisterDriverFunction.java | 8 +-
.../ConnectorsDistributedSystemService.java | 1 -
.../cli/ConnectionsCommandManagerTest.java | 2 +-
.../internal/cli/DeregisterDriverFunctionTest.java | 6 +-
.../jdbc/internal/cli/ListDriversFunctionTest.java | 6 +-
.../internal/cli/RegisterDriverFunctionTest.java | 6 +-
geode-core/build.gradle | 2 -
.../mock/AlterMockCacheExtensionFunction.java | 4 +-
.../mock/AlterMockRegionExtensionFunction.java | 4 +-
.../mock/CreateMockCacheExtensionFunction.java | 4 +-
.../mock/CreateMockRegionExtensionFunction.java | 4 +-
.../mock/DestroyMockCacheExtensionFunction.java | 4 +-
.../mock/DestroyMockRegionExtensionFunction.java | 4 +-
.../ClusterConfigDeployJarDUnitTest.java | 48 +--
...rConfigServerRestartWithJarDeployDUnitTest.java | 2 +-
.../FunctionToFileTrackerIntegrationTest.java | 150 -------
.../ClassPathLoaderDeployTest.java | 18 +-
.../ClassPathLoaderIntegrationTest.java | 83 ++--
.../ClassPathLoaderJUnitTest.java | 167 +++-----
.../apache/geode/internal}/DeployedJarTest.java | 2 +-
.../geode/internal}/JarDeployerDeadlockTest.java | 24 +-
.../geode/internal}/JarDeployerFileTest.java | 110 +++--
.../internal}/JarDeployerIntegrationTest.java | 95 ++---
.../backup/BackupFileCopierIntegrationTest.java | 61 +--
.../backup/IncrementalBackupIntegrationTest.java | 22 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 4 +-
.../admin/internal/ManagedEntityConfigXml.java | 2 +-
.../internal/ManagedEntityControllerFactory.java | 2 +-
.../internal/AdminDistributedSystemJmxImpl.java | 10 +-
.../geode/admin/jmx/internal/AgentConfigImpl.java | 2 +-
.../apache/geode/admin/jmx/internal/AgentImpl.java | 20 +-
.../admin/jmx/internal/CacheServerJmxImpl.java | 18 +-
.../internal/ConfigurationParameterJmxImpl.java | 6 +-
.../DistributedSystemHealthConfigJmxImpl.java | 5 +-
.../jmx/internal/DistributionLocatorJmxImpl.java | 4 +-
.../jmx/internal/GemFireHealthConfigJmxImpl.java | 7 +-
.../admin/jmx/internal/GemFireHealthJmxImpl.java | 10 +-
.../admin/jmx/internal/GenerateMBeanHTML.java | 2 +-
.../internal/{MBeanUtils.java => MBeanUtil.java} | 26 +-
.../jmx/internal/MemberInfoWithStatsMBean.java | 4 +-
.../jmx/internal/StatisticResourceJmxImpl.java | 12 +-
.../internal/SystemMemberBridgeServerJmxImpl.java | 6 +-
.../jmx/internal/SystemMemberCacheJmxImpl.java | 28 +-
.../geode/admin/jmx/internal/SystemMemberJmx.java | 4 +-
.../admin/jmx/internal/SystemMemberJmxImpl.java | 18 +-
.../jmx/internal/SystemMemberRegionJmxImpl.java | 8 +-
.../apache/geode/admin/jmx/internal/package.html | 16 +-
.../client/internal/ClientPartitionAdvisor.java | 2 +-
.../internal/execute/FunctionToFileTracker.java | 233 -----------
.../internal/QueryConfigurationServiceImpl.java | 2 +-
.../deployment/internal/JarDeploymentService.java | 109 -----
.../internal/JarDeploymentServiceFactory.java | 84 ----
.../geode/distributed/DistributedSystem.java | 2 +-
.../InternalConfigurationPersistenceService.java | 55 +--
.../{classloader => }/ChildFirstClassLoader.java | 2 +-
.../{ClassLoadUtils.java => ClassLoadUtil.java} | 3 +-
.../{classloader => }/ClassPathLoader.java | 44 +-
.../DeployJarChildFirstClassLoader.java | 2 +-
.../org/apache/geode/internal/DeployedJar.java | 456 +++++++++++++++++++++
.../geode/internal/InternalDataSerializer.java | 1 -
.../org/apache/geode/internal}/JarDeployer.java | 275 ++++++++++---
.../internal/ObjectInputStreamFilterWrapper.java | 1 -
.../apache/geode/internal/VersionDescription.java | 1 -
.../geode/internal/cache/AbstractDiskRegion.java | 2 +-
.../internal/cache/ClusterConfigurationLoader.java | 39 +-
.../internal/cache/EvictionAttributesImpl.java | 2 +-
.../apache/geode/internal/cache/FilterProfile.java | 4 +-
.../geode/internal/cache/GemFireCacheImpl.java | 25 +-
.../apache/geode/internal/cache/LocalRegion.java | 4 +-
.../internal/cache/backup/BackupFileCopier.java | 42 +-
.../geode/internal/cache/backup/BackupTask.java | 4 +-
.../cache/control/InternalResourceManager.java | 2 +-
.../colocation/ColocationLoggerFactory.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java | 4 +-
.../tier/sockets/CacheClientProxyFactory.java | 2 +-
.../internal/cache/tier/sockets/Handshake.java | 4 +-
.../geode/internal/cache/xmlcache/CacheXml.java | 2 +-
.../internal/cache/xmlcache/CacheXmlParser.java | 2 +-
.../cache/xmlcache/DefaultEntityResolver2.java | 2 +-
.../apache/geode/internal/config/JAXBService.java | 2 +-
.../internal/datasource/DataSourceFactory.java | 2 +-
.../datasource/GemFireBasicDataSource.java | 2 +-
.../i18n/AbstractStringIdResourceBundle.java | 2 +-
.../apache/geode/internal/jndi/JNDIInvoker.java | 6 +-
.../apache/geode/internal/net/SocketCreator.java | 2 +-
.../geode/internal/offheap/OffHeapStorage.java | 2 +-
.../geode/internal/security/AuthorizeRequest.java | 4 +-
.../internal/security/AuthorizeRequestPP.java | 4 +-
.../internal/security/CallbackInstantiator.java | 4 +-
.../geode/internal/size/ObjectGraphSizer.java | 2 +-
.../internal/statistics/StatisticsTypeXml.java | 2 +-
.../apache/geode/internal/stats50/VMStats50.java | 2 +-
.../{DriverJarUtils.java => DriverJarUtil.java} | 4 +-
.../logging/internal/LoggingProviderLoader.java | 2 +-
.../geode/management/internal/MBeanJMXAdapter.java | 4 +-
.../management/internal/MBeanProxyFactory.java | 4 +-
.../internal/MonitoringRegionCacheListener.java | 6 +-
.../internal/beans/ManagementAdapter.java | 6 +-
.../configuration/domain/Configuration.java | 22 +-
.../domain/DeclarableTypeInstantiator.java | 2 +-
.../configuration/mutators/DeploymentManager.java | 8 +-
.../realizers/DeploymentRealizer.java | 55 +--
.../validators/DeploymentValidator.java | 14 +-
.../functions/CacheRealizationFunction.java | 11 +-
.../geode/management/internal/i18n/CliStrings.java | 5 -
.../management/internal/util/ManagementUtils.java | 2 +-
.../apache/geode/pdx/internal/PdxInstanceImpl.java | 2 +-
.../org/apache/geode/services/result/Result.java | 75 ----
.../geode/services/result/ServiceResult.java | 66 ---
.../apache/geode/services/result/impl/Failure.java | 123 ------
.../apache/geode/services/result/impl/Success.java | 85 ----
...gurationPersistenceServiceDeployedJarTest.java} | 7 +-
.../{classloader => }/ClassPathLoaderTest.java | 25 +-
.../cache/xmlcache/AbstractEntityResolverTest.java | 2 +-
...verJarUtilsTest.java => DriverJarUtilTest.java} | 6 +-
.../configuration/domain/ConfigurationTest.java | 18 +-
.../mutators/DeploymentManagerTest.java | 4 +-
.../realizers/DeploymentRealizerTest.java | 49 ++-
.../validators/DeploymentValidatorTest.java | 2 +-
.../functions/CacheRealizationFunctionTest.java | 3 +-
geode-core/src/test/resources/expected-pom.xml | 5 -
.../cq/internal/CQDistributedSystemService.java | 2 +-
geode-deployment-legacy/build.gradle | 37 --
.../geode/internal/deployment/DeployedJar.java | 200 ---------
.../impl/legacy/LegacyJarDeploymentService.java | 241 -----------
....geode.deployment.internal.JarDeploymentService | 1 -
.../src/test/resources/expected-pom.xml | 65 ---
.../tomcat_installing_the_module.html.md.erb | 1 -
.../internal/configuration/ClusterConfig.java | 95 ++---
.../configuration/ClusterConfigTestBase.java | 13 +-
.../test/dunit/rules/DistributedReference.java | 2 +-
.../geode/test/junit/rules/MemberStarterRule.java | 4 +-
geode-gfsh/build.gradle | 1 -
...liUtilsDUnitTest.java => CliUtilDUnitTest.java} | 8 +-
...DeployCommandFunctionRegistrationDUnitTest.java | 2 +-
.../commands/DeployCommandRedeployDUnitTest.java | 7 +-
.../DeploySemanticVersionJarDUnitTest.java | 61 +--
.../cli/commands/DeployWithGroupsDUnitTest.java | 31 +-
.../GfshParserAutoCompletionIntegrationTest.java | 4 +-
.../functions/CreateJndiBindingFunctionTest.java | 6 +-
.../geode/management/cli/CommandService.java | 4 +-
.../internal/GfshDistributedSystemService.java | 2 +-
.../internal/cli/{CliUtils.java => CliUtil.java} | 4 +-
.../management/internal/cli/CommandManager.java | 2 +-
.../geode/management/internal/cli/Launcher.java | 2 +-
.../internal/cli/commands/DeployCommand.java | 86 ++--
.../internal/cli/commands/ListDeployedCommand.java | 19 +-
.../internal/cli/commands/NetstatCommand.java | 6 +-
.../internal/cli/commands/OfflineGfshCommand.java | 4 +-
.../internal/cli/commands/StartServerCommand.java | 4 +-
.../internal/cli/commands/UndeployCommand.java | 45 +-
.../internal/cli/domain/DeploymentInfo.java | 67 ---
.../cli/functions/CloseDurableClientFunction.java | 4 +-
.../cli/functions/CloseDurableCqFunction.java | 4 +-
.../functions/CreateAsyncEventQueueFunction.java | 2 +-
.../cli/functions/CreateJndiBindingFunction.java | 6 +-
.../cli/functions/DataCommandFunction.java | 2 +-
.../internal/cli/functions/DeployFunction.java | 118 +++---
.../functions/DestroyGatewayReceiverFunction.java | 4 +-
.../cli/functions/GatewaySenderCreateFunction.java | 6 +-
.../functions/GatewaySenderDestroyFunction.java | 4 +-
.../GetSubscriptionQueueSizeFunction.java | 4 +-
.../cli/functions/ListDeployedFunction.java | 21 +-
.../cli/functions/ListDurableCqNamesFunction.java | 4 +-
.../internal/cli/functions/NetstatFunction.java | 6 +-
.../internal/cli/functions/RegionFunctionArgs.java | 2 +-
.../internal/cli/functions/UndeployFunction.java | 94 ++---
.../cli/functions/UserFunctionExecution.java | 2 +-
.../geode/management/internal/cli/shell/Gfsh.java | 4 +-
.../internal/cli/shell/GfshExecutionStrategy.java | 2 +-
.../internal/cli/util/DeploymentInfoTableUtil.java | 61 ---
.../sanctioned-geode-gfsh-serializables.txt | 7 +-
.../ExportClusterConfigurationCommandTest.java | 4 +-
geode-gfsh/src/test/resources/expected-pom.xml | 5 -
.../jta/CacheJTAPooledDataSourceFactory.java | 2 +-
.../internal/configuration/ConfigGroup.java | 27 +-
.../geode/test/junit/rules/CloseableReference.java | 2 +-
.../geode/test/junit/rules/GfshParserRule.java | 2 +-
geode-logging/build.gradle | 2 +-
geode-logging/src/test/resources/expected-pom.xml | 2 +-
.../cli/functions/LuceneCreateIndexFunction.java | 6 +-
.../internal/LuceneDistributedSystemService.java | 1 -
geode-management/build.gradle | 1 -
.../geode/management/configuration/Deployment.java | 78 +---
.../configuration/MultiJarDeployment.java | 20 -
.../management/internal/utils/JarFileUtils.java | 128 ------
.../sanctioned-geode-management-serializables.txt | 2 +-
.../management/configuration/DeploymentTest.java | 25 +-
.../src/test/resources/expected-pom.xml | 5 -
.../MemcachedDistributedSystemService.java | 2 +-
geode-protobuf/geode-protobuf-test/build.gradle | 1 -
.../internal/RedisDistributedSystemService.java | 2 +-
.../internal/WANDistributedSystemService.java | 1 -
.../rest/DeployManagementIntegrationTest.java | 8 +-
.../DeploymentManagementController.java | 14 +-
gradle.properties | 1 -
settings.gradle | 1 -
219 files changed, 1735 insertions(+), 3665 deletions(-)
delete mode 100644
geode-assembly/src/acceptanceTest/java/org/apache/geode/modules/DeployJarAcceptanceTest.java
delete mode 100644
geode-assembly/src/acceptanceTest/resources/example/test/function/ExampleFunction.java
delete mode 100644
geode-assembly/src/acceptanceTest/resources/example/test/function/PojoFunction.java
delete mode 100644
geode-assembly/src/acceptanceTest/resources/example/test/pojo/ExamplePojo.java
delete mode 100644
geode-core/src/integrationTest/java/org/apache/geode/cache/internal/execute/FunctionToFileTrackerIntegrationTest.java
rename
geode-core/src/integrationTest/java/org/apache/geode/internal/{classloader =>
}/ClassPathLoaderDeployTest.java (91%)
rename
geode-core/src/integrationTest/java/org/apache/geode/internal/{classloader =>
}/ClassPathLoaderIntegrationTest.java (87%)
rename
geode-core/src/integrationTest/java/org/apache/geode/internal/{classloader =>
}/ClassPathLoaderJUnitTest.java (77%)
rename
{geode-deployment-legacy/src/test/java/org/apache/geode/internal/deployment =>
geode-core/src/integrationTest/java/org/apache/geode/internal}/DeployedJarTest.java
(98%)
rename
{geode-deployment-legacy/src/test/java/org/apache/geode/internal/deployment =>
geode-core/src/integrationTest/java/org/apache/geode/internal}/JarDeployerDeadlockTest.java
(83%)
rename
{geode-deployment-legacy/src/test/java/org/apache/geode/internal/deployment =>
geode-core/src/integrationTest/java/org/apache/geode/internal}/JarDeployerFileTest.java
(82%)
rename
{geode-deployment-legacy/src/integrationTest/java/org/apache/geode/internal/deployment
=>
geode-core/src/integrationTest/java/org/apache/geode/internal}/JarDeployerIntegrationTest.java
(68%)
rename {geode-deployment-legacy =>
geode-core}/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
(83%)
rename
geode-core/src/main/java/org/apache/geode/admin/jmx/internal/{MBeanUtils.java
=> MBeanUtil.java} (97%)
delete mode 100644
geode-core/src/main/java/org/apache/geode/cache/internal/execute/FunctionToFileTracker.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/deployment/internal/JarDeploymentService.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/deployment/internal/JarDeploymentServiceFactory.java
rename geode-core/src/main/java/org/apache/geode/internal/{classloader =>
}/ChildFirstClassLoader.java (98%)
rename geode-core/src/main/java/org/apache/geode/internal/{ClassLoadUtils.java
=> ClassLoadUtil.java} (97%)
rename geode-core/src/main/java/org/apache/geode/internal/{classloader =>
}/ClassPathLoader.java (89%)
rename geode-core/src/main/java/org/apache/geode/internal/{classloader =>
}/DeployJarChildFirstClassLoader.java (98%)
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/DeployedJar.java
rename
{geode-deployment-legacy/src/main/java/org/apache/geode/internal/deployment =>
geode-core/src/main/java/org/apache/geode/internal}/JarDeployer.java (53%)
rename
geode-core/src/main/java/org/apache/geode/internal/util/{DriverJarUtils.java =>
DriverJarUtil.java} (98%)
delete mode 100644
geode-core/src/main/java/org/apache/geode/services/result/Result.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/services/result/ServiceResult.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/services/result/impl/Failure.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/services/result/impl/Success.java
rename
geode-core/src/test/java/org/apache/geode/distributed/internal/{InternalConfigurationPersistenceServiceDeploymentTest.java
=> InternalConfigurationPersistenceServiceDeployedJarTest.java} (97%)
rename geode-core/src/test/java/org/apache/geode/internal/{classloader =>
}/ClassPathLoaderTest.java (95%)
rename
geode-core/src/test/java/org/apache/geode/internal/util/{DriverJarUtilsTest.java
=> DriverJarUtilTest.java} (95%)
delete mode 100644 geode-deployment-legacy/build.gradle
delete mode 100644
geode-deployment-legacy/src/main/java/org/apache/geode/internal/deployment/DeployedJar.java
delete mode 100644
geode-deployment-legacy/src/main/java/org/apache/geode/internal/deployment/impl/legacy/LegacyJarDeploymentService.java
delete mode 100644
geode-deployment-legacy/src/main/resources/META-INF/services/org.apache.geode.deployment.internal.JarDeploymentService
delete mode 100644 geode-deployment-legacy/src/test/resources/expected-pom.xml
rename
geode-gfsh/src/distributedTest/java/org/apache/geode/management/internal/cli/{CliUtilsDUnitTest.java
=> CliUtilDUnitTest.java} (93%)
rename
geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/{CliUtils.java
=> CliUtil.java} (99%)
delete mode 100644
geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/domain/DeploymentInfo.java
delete mode 100644
geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/util/DeploymentInfoTableUtil.java
delete mode 100644
geode-management/src/main/java/org/apache/geode/management/configuration/MultiJarDeployment.java
delete mode 100644
geode-management/src/main/java/org/apache/geode/management/internal/utils/JarFileUtils.java
