You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2019/02/20 23:42:11 UTC
[geode] branch develop updated: GEODE-6283: have the management rest controller call the internal man… (#3210)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao 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 92e1ffe GEODE-6283: have the management rest controller call the internal man… (#3210)
92e1ffe is described below
commit 92e1ffe1f527fad509f28d2904b3e212db9dca4e
Author: jinmeiliao <ji...@pivotal.io>
AuthorDate: Wed Feb 20 15:42:01 2019 -0800
GEODE-6283: have the management rest controller call the internal man… (#3210)
* fix copy and paste error
* remove dead code
---
.../apache/geode/distributed/internal/InternalLocator.java | 11 -----------
.../java/org/apache/geode/internal/cache/HttpService.java | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
index 788d71b..03cf0e6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
@@ -39,7 +39,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.webapp.WebAppContext;
import org.apache.geode.CancelException;
import org.apache.geode.annotations.internal.MakeNotStatic;
@@ -198,7 +197,6 @@ public class InternalLocator extends Locator implements ConnectListener, LogConf
private final LoggingSession loggingSession;
private final Set<LogConfigListener> logConfigListeners = new HashSet<>();
- private WebAppContext managementWebapp;
public boolean isSharedConfigurationEnabled() {
return this.config.getEnableClusterConfiguration();
@@ -870,15 +868,6 @@ public class InternalLocator extends Locator implements ConnectListener, LogConf
}
}
- // stop the managementwebapp
- if (managementWebapp != null) {
- try {
- managementWebapp.stop();
- } catch (Exception e) {
- logger.error("unable to stop the management webapp.", e);
- }
- }
-
removeLocator(this);
handleShutdown();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HttpService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HttpService.java
index d248675..62f8ac9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/HttpService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HttpService.java
@@ -59,7 +59,7 @@ public class HttpService {
public static final String GEODE_SSLCONFIG_SERVLET_CONTEXT_PARAM = "org.apache.geode.sslConfig";
public static final String CLUSTER_MANAGEMENT_SERVICE_CONTEXT_PARAM =
- "org.apache.geode.sslConfig";
+ "org.apache.geode.cluster.management.service";
private List<WebAppContext> webApps = new ArrayList<>();