This is an automated email from the ASF dual-hosted git repository.
klund pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from d9a9e30 Merge pull request #3878 from
aaronlindsey/server-online-uses-startup-tasks
add afc95db Revert "Merge pull request #3878 from
aaronlindsey/server-online-uses-startup-tasks"
No new revisions were added by this update.
Summary of changes:
.../geode/launchers/ServerStartupOnlineTest.java | 207 ------------------
.../launchers/startuptasks/WaitForFileToExist.java | 60 ------
.../LauncherMemberMXBeanIntegrationTest.java | 10 +
.../ServerLauncherWithProviderRegressionTest.java | 5 +-
.../ControllableProcessIntegrationTest.java | 19 +-
.../apache/geode/distributed/LocatorLauncher.java | 6 +-
.../apache/geode/distributed/ServerLauncher.java | 96 +--------
.../distributed/ServerLauncherCacheProvider.java | 1 -
.../cache/control/InternalResourceManager.java | 25 +--
.../internal/process/ControllableProcess.java | 217 ++++++++++++++++++-
.../internal/process/FileControllableProcess.java | 238 ---------------------
.../internal/process/FileProcessController.java | 2 +-
.../internal/process/MBeanProcessController.java | 2 +-
.../distributed/ServerLauncherBuilderTest.java | 48 -----
.../geode/distributed/ServerLauncherTest.java | 201 ++++++-----------
.../cache/control/InternalResourceManagerTest.java | 133 +++++++-----
.../internal/process/ControllableProcessTest.java | 4 +-
.../geode/test/junit/rules/gfsh/GfshRule.java | 3 +-
18 files changed, 398 insertions(+), 879 deletions(-)
delete mode 100644
geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerStartupOnlineTest.java
delete mode 100644
geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/startuptasks/WaitForFileToExist.java
mode change 100644 => 100755
geode-core/src/main/java/org/apache/geode/internal/process/ControllableProcess.java
delete mode 100755
geode-core/src/main/java/org/apache/geode/internal/process/FileControllableProcess.java