You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2015/12/07 18:06:15 UTC
[33/50] [abbrv] incubator-geode git commit: GEODE-606: Add some
logging to war file detection
GEODE-606: Add some logging to war file detection
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5a9fdb8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5a9fdb8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5a9fdb8a
Branch: refs/heads/feature/GEODE-17
Commit: 5a9fdb8ac6dfde9d1822a429ce94f6af05353a86
Parents: 38dd3ed
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Nov 25 14:53:08 2015 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Tue Dec 1 09:54:09 2015 -0800
----------------------------------------------------------------------
.../gemfire/management/internal/AgentUtil.java | 56 ++++++++++----------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5a9fdb8a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
index e5b88ad..bb160ea 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
@@ -38,8 +38,6 @@ public class AgentUtil {
private static final String LIB_WEB_API_WAR = "/lib/gemfire-web-api-";
private static final String TOOLS_WEB_WAR = "/tools/Extensions/gemfire-web-";
private static final String LIB_WEB_WAR = "/lib/gemfire-web-";
- private static final String TOOLS_API_WAR = "/tools/Extensions/gemfire-api-";
- private static final String LIB_API_WAR = "/lib/gemfire-api-";
private static final String TOOLS_PULSE_WAR = "/tools/Pulse/pulse.war";
private static final String LIB_PULSE_WAR = "/lib/pulse.war";
public static final String ERROR_VARIABLE_NOT_SET = "The GEMFIRE environment variable must be set!";
@@ -53,13 +51,18 @@ public class AgentUtil {
public String getGemFireWebApiWarLocation() {
String gemfireHome = getGemFireHome();
assert !StringUtils.isBlank(gemfireHome) : ERROR_VARIABLE_NOT_SET;
- logger.warn(gemfireHome + TOOLS_WEB_API_WAR + gemfireVersion + ".war");
- if (new File(gemfireHome + TOOLS_WEB_API_WAR + gemfireVersion + ".war").isFile()) {
- return gemfireHome + TOOLS_WEB_API_WAR + gemfireVersion + ".war";
- } else if (new File(gemfireHome + LIB_WEB_API_WAR + gemfireVersion + ".war").isFile()) {
- return gemfireHome + LIB_WEB_API_WAR + gemfireVersion + ".war";
+ String toolsWebApiWar = gemfireHome + TOOLS_WEB_API_WAR + gemfireVersion + ".war";
+ String libWebApiWar = gemfireHome + LIB_WEB_API_WAR + gemfireVersion + ".war";
+
+ if (new File(toolsWebApiWar).isFile()) {
+ logger.info("GemFire Dev REST API war: {}", toolsWebApiWar);
+ return toolsWebApiWar;
+ } else if (new File(libWebApiWar).isFile()) {
+ logger.info("GemFire Dev REST API war: {}", libWebApiWar);
+ return libWebApiWar;
} else {
+ logger.warn("GemFire Dev REST API war not found - neither {} or {} exist", toolsWebApiWar, libWebApiWar);
return null;
}
}
@@ -74,24 +77,17 @@ public class AgentUtil {
String gemfireHome = getGemFireHome();
assert !StringUtils.isBlank(gemfireHome) : ERROR_VARIABLE_NOT_SET;
- if (new File(gemfireHome + TOOLS_WEB_WAR + gemfireVersion + ".war").isFile()) {
- return gemfireHome + TOOLS_WEB_WAR + gemfireVersion + ".war";
- } else if (new File(gemfireHome + LIB_WEB_WAR + gemfireVersion + ".war").isFile()) {
- return gemfireHome + LIB_WEB_WAR + gemfireVersion + ".war";
- } else {
- return null;
- }
- }
-
- public String getGemfireApiWarLocation() {
- String gemfireHome = getGemFireHome();
- assert !StringUtils.isBlank(gemfireHome) :ERROR_VARIABLE_NOT_SET;
+ String toolsWebWar = gemfireHome + TOOLS_WEB_WAR + gemfireVersion + ".war";
+ String libWebWar = gemfireHome + LIB_WEB_WAR + gemfireVersion + ".war";
- if (new File(gemfireHome + TOOLS_API_WAR + gemfireVersion + ".war").isFile()) {
- return gemfireHome + TOOLS_API_WAR + gemfireVersion + ".war";
- } else if (new File(gemfireHome + LIB_API_WAR + gemfireVersion + ".war").isFile()) {
- return gemfireHome + LIB_API_WAR + gemfireVersion + ".war";
+ if (new File(toolsWebWar).isFile()) {
+ logger.info("GemFire Admin REST war: {}", toolsWebWar);
+ return toolsWebWar;
+ } else if (new File(libWebWar).isFile()) {
+ logger.info("GemFire Admin REST war: {}", libWebWar);
+ return libWebWar;
} else {
+ logger.warn("GemFire Admin REST war not found - neither {} or {} exist", toolsWebWar, libWebWar);
return null;
}
}
@@ -104,11 +100,17 @@ public class AgentUtil {
String gemfireHome = getGemFireHome();
assert !StringUtils.isBlank(gemfireHome) : ERROR_VARIABLE_NOT_SET;
- if (new File(gemfireHome + TOOLS_PULSE_WAR).isFile()) {
- return gemfireHome + TOOLS_PULSE_WAR;
- } else if (new File(gemfireHome + LIB_PULSE_WAR).isFile()) {
- return gemfireHome + LIB_PULSE_WAR;
+ String toolsPulseWar = gemfireHome + TOOLS_PULSE_WAR;
+ String libPulseWar = gemfireHome + LIB_PULSE_WAR;
+
+ if (new File(toolsPulseWar).isFile()) {
+ logger.info("GemFire Pulse war: {}", toolsPulseWar);
+ return toolsPulseWar;
+ } else if (new File(libPulseWar).isFile()) {
+ logger.info("GemFire Pulse war: {}", libPulseWar);
+ return libPulseWar;
} else {
+ logger.warn("GemFire Pulse war not found - neither {} or {} exist", toolsPulseWar, libPulseWar);
return null;
}
}