Repository: incubator-geode Updated Branches: refs/heads/develop c78996f4b -> 440e16504
GEODE-1122: Replace environment variable "GEMFIRE" with "GEODE_HOME" GEODE-1122: Reverting gradle-wrapper.properties Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/440e1650 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/440e1650 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/440e1650 Branch: refs/heads/develop Commit: 440e16504a68fc475fb4c7aabe0e4c3941087c12 Parents: c78996f Author: adongre <avin...@ampool.io> Authored: Sat Nov 26 13:37:48 2016 +0530 Committer: adongre <avin...@ampool.io> Committed: Tue Nov 29 10:44:03 2016 +0530 ---------------------------------------------------------------------- geode-assembly/build.gradle | 4 +- geode-assembly/src/main/dist/bin/gfsh | 18 +++---- geode-assembly/src/main/dist/bin/gfsh.bat | 10 ++-- .../org/apache/geode/BundledJarsJUnitTest.java | 14 +++--- .../LauncherLifecycleCommandsJUnitTest.java | 10 ++-- .../internal/AdminDistributedSystemImpl.java | 2 +- .../DistributedSystemHealthMonitor.java | 2 +- .../admin/internal/ManagedEntityConfigImpl.java | 2 +- .../apache/geode/internal/admin/GemFireVM.java | 4 +- .../admin/remote/FetchHostResponse.java | 16 +++---- .../internal/admin/remote/RemoteGemFireVM.java | 5 +- .../geode/management/internal/AgentUtil.java | 50 ++++++++++---------- .../cli/commands/LauncherLifecycleCommands.java | 26 +++++----- .../management/internal/cli/shell/Gfsh.java | 4 +- .../gfsh/configuring_gfsh.html.md.erb | 2 +- .../LoginHandlerInterceptorJUnitTest.java | 22 +++++---- 16 files changed, 96 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index d255b4c..dba5dc7 100644 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -96,7 +96,7 @@ test { } tasks.withType(Test){ - environment 'GEMFIRE', "$buildDir/install/${distributions.main.baseName}/lib" + environment 'GEODE_HOME', "$buildDir/install/${distributions.main.baseName}/lib" } task defaultDistributionConfig(type: JavaExec, dependsOn: classes) { @@ -385,7 +385,7 @@ distributions { def dependOnInstalledProduct = { dependsOn installDist def install = file("$buildDir/install/${distributions.main.baseName}") - environment ('GEMFIRE', install) + environment ('GEODE_HOME', install) } // Add the configuration closure to the test targets so they depend on the install directory http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-assembly/src/main/dist/bin/gfsh ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/bin/gfsh b/geode-assembly/src/main/dist/bin/gfsh index 7e6531e..309723e 100755 --- a/geode-assembly/src/main/dist/bin/gfsh +++ b/geode-assembly/src/main/dist/bin/gfsh @@ -21,7 +21,7 @@ # # JAVA_ARGS - java arguments, i.e., -Xms1024m -Xmx1024m ... # -# GEMFIRE - GemFire product directory +# GEODE_HOME - Geode product directory # # @@ -43,8 +43,8 @@ else GFPATH=$( cd $(dirname $0)/..; pwd ) fi -# Set GEMFIRE to the product toplevel directory -GEMFIRE=$GFPATH +# Set GEODE_HOME to the product toplevel directory +GEODE_HOME=$GFPATH UNAME=$( uname ) if [[ "$UNAME" == CYGWIN* ]]; then @@ -65,17 +65,17 @@ if [ "x$WINDIR" != "x" ]; then fi fi -if [ ! -f $GEMFIRE/lib/geode-dependencies.jar ]; then - echo "ERROR: Could not determine GEMFIRE location." +if [ ! -f $GEODE_HOME/lib/geode-dependencies.jar ]; then + echo "ERROR: Could not determine GEODE_HOME location." exit 1 fi -export GEMFIRE +export GEODE_HOME -GEMFIRE_JARS=$GEMFIRE/lib/gfsh-dependencies.jar +GEODE_JARS=$GEODE_HOME/lib/gfsh-dependencies.jar if [ "x$CLASSPATH" != "x" ]; then - GEMFIRE_JARS=$GEMFIRE_JARS:$CLASSPATH + GEODE_JARS=$GEODE_JARS:$CLASSPATH fi -CLASSPATH=$GEMFIRE_JARS +CLASSPATH=$GEODE_JARS # # Copy default .gfshrc to the home directory. Uncomment if needed. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-assembly/src/main/dist/bin/gfsh.bat ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index a89845c..5a40141 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -21,7 +21,7 @@ REM GF_JAVA - java executable path. REM REM JAVA_ARGS - java arguments, i.e., -Xms1024m -Xmx1024m ... REM -REM GEMFIRE - GemFire product Directory +REM GEODE_HOME - Geode product Directory REM REM @@ -31,13 +31,13 @@ REM REM echo %gf% REM echo %scriptdir% @if exist "%gf%\lib\geode-dependencies.jar" @goto gfok -@echo Could not determine GEMFIRE location +@echo Could not determine GEODE_HOME location @verify other 2>nul @goto done :gfok -@set GEMFIRE=%gf% +@set GEODE_HOME=%gf% -@set GFSH_JARS=%GEMFIRE%\lib\gfsh-dependencies.jar +@set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar REM if a system level classpath is set, append it to the classes gfsh will need @if defined CLASSPATH ( @set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH% @@ -58,7 +58,7 @@ REM REM Copy default .gfshrc to the home directory. Uncomment if needed. REM REM @if not exist "%USERPROFILE%\.gemfire\.gfsh2rc" ( -REM @xcopy /q "%GEMFIRE%\defaultConfigs\.gfsh2rc" "%USERPROFILE%\.gemfire" +REM @xcopy /q "%GEODE_HOME%\defaultConfigs\.gfsh2rc" "%USERPROFILE%\.gemfire" REM ) REM http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java index 53f49cd..b7ada4a 100644 --- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; import java.util.jar.JarFile; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -42,7 +41,7 @@ import org.apache.geode.util.test.TestUtil; public class BundledJarsJUnitTest { private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$"; - protected static final String GEMFIRE_HOME = System.getenv("GEMFIRE"); + protected static final String GEODE_HOME = System.getenv("GEODE_HOME"); private Set<String> expectedJars; @Before @@ -88,16 +87,17 @@ public class BundledJarsJUnitTest { * Find all of the jars bundled with the project. Key is the name of the jar, value is the path. */ protected TreeMap<String, String> getBundledJars() { - File gemfireHomeDirectory = new File(GEMFIRE_HOME); + File geodeHomeDirectory = new File(GEODE_HOME); - assertTrue("Please set the GEMFIRE environment variable to the product installation directory.", - gemfireHomeDirectory.isDirectory()); + assertTrue( + "Please set the GEODE_HOME environment variable to the product installation directory.", + geodeHomeDirectory.isDirectory()); - List<File> jars = FileUtil.findAll(gemfireHomeDirectory, ".*\\.jar"); + List<File> jars = FileUtil.findAll(geodeHomeDirectory, ".*\\.jar"); TreeMap<String, String> sortedJars = new TreeMap<String, String>(); jars.stream().forEach(jar -> sortedJars.put(jar.getName(), jar.getPath())); - List<File> wars = FileUtil.findAll(gemfireHomeDirectory, ".*\\.war"); + List<File> wars = FileUtil.findAll(geodeHomeDirectory, ".*\\.war"); TreeSet<File> sortedWars = new TreeSet<File>(wars); sortedWars.stream().flatMap(BundledJarsJUnitTest::extractJarNames) .forEach(jar -> sortedJars.put(jar.getName(), jar.getPath())); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java index 8ac5dd5..a31c78c 100755 --- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java +++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java @@ -342,14 +342,14 @@ public class LauncherLifecycleCommandsJUnitTest { String[] userClasspaths = {"/path/to/classes:/path/to/libs/1.jar:/path/to/libs/2.jar", "/path/to/ext/libs/1.jar:/path/to/ext/classes:/path/to/ext/lib/10.jar"}; - String expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME + String expectedClasspath = LauncherLifecycleCommands.GEODE_JAR_PATHNAME .concat(File.pathSeparator).concat(toClasspath(userClasspaths)).concat(File.pathSeparator) .concat(toClasspath(jarFilePathnames)); assertEquals(expectedClasspath, getLauncherLifecycleCommands() .toClasspath(EXCLUDE_SYSTEM_CLASSPATH, jarFilePathnames, userClasspaths)); - expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator) + expectedClasspath = LauncherLifecycleCommands.GEODE_JAR_PATHNAME.concat(File.pathSeparator) .concat(toClasspath(userClasspaths)).concat(File.pathSeparator) .concat(System.getProperty("java.class.path")).concat(File.pathSeparator) .concat(toClasspath(jarFilePathnames)); @@ -357,16 +357,16 @@ public class LauncherLifecycleCommandsJUnitTest { assertEquals(expectedClasspath, getLauncherLifecycleCommands() .toClasspath(INCLUDE_SYSTEM_CLASSPATH, jarFilePathnames, userClasspaths)); - expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator) + expectedClasspath = LauncherLifecycleCommands.GEODE_JAR_PATHNAME.concat(File.pathSeparator) .concat(System.getProperty("java.class.path")); assertEquals(expectedClasspath, getLauncherLifecycleCommands() .toClasspath(INCLUDE_SYSTEM_CLASSPATH, null, (String[]) null)); - assertEquals(LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME, getLauncherLifecycleCommands() + assertEquals(LauncherLifecycleCommands.GEODE_JAR_PATHNAME, getLauncherLifecycleCommands() .toClasspath(EXCLUDE_SYSTEM_CLASSPATH, null, (String[]) null)); - assertEquals(LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME, + assertEquals(LauncherLifecycleCommands.GEODE_JAR_PATHNAME, getLauncherLifecycleCommands().toClasspath(EXCLUDE_SYSTEM_CLASSPATH, new String[0], "")); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java index 59fce55..ed0c015 100755 --- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java +++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java @@ -1339,7 +1339,7 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD InetAddress vmHost = vm.getHost(); File vmWorkingDir = vm.getWorkingDirectory(); - File vmProdDir = vm.getGemFireDir(); + File vmProdDir = vm.getGeodeHomeDir(); if (vmHost.equals(managedHost) && isSameFile(vmWorkingDir, managedWorkingDir) && isSameFile(vmProdDir, managedProdDir)) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java index 246f518..bf4d4a4 100644 --- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java @@ -229,7 +229,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM { LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString()); } - public java.io.File getGemFireDir() { + public java.io.File getGeodeHomeDir() { throw new UnsupportedOperationException( LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java index fc41e5f..c7a8505 100644 --- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java +++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java @@ -116,7 +116,7 @@ public abstract class ManagedEntityConfigImpl implements ManagedEntityConfig { protected ManagedEntityConfigImpl(GemFireVM vm) { this.host = SocketCreator.getHostName(vm.getHost()); this.workingDirectory = vm.getWorkingDirectory().getAbsolutePath(); - this.productDirectory = vm.getGemFireDir().getAbsolutePath(); + this.productDirectory = vm.getGeodeHomeDir().getAbsolutePath(); this.remoteCommand = null; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java index cce0d0a..7b6747d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java @@ -71,9 +71,9 @@ public interface GemFireVM { public java.io.File getWorkingDirectory(); /** - * Returns the product directory (the value of GEMFIRE env variable) + * Returns the product directory (the value of GEODE_HOME env variable) */ - public java.io.File getGemFireDir(); + public java.io.File getGeodeHomeDir(); /** * Returns the time the system was started http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java index 37cc8ae..9a771f8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/FetchHostResponse.java @@ -47,7 +47,7 @@ public final class FetchHostResponse extends AdminResponse { // instance variables InetAddress host; - File gemfireDir; + File geodeHomeDir; File workingDir; long birthDate; boolean isDedicatedCacheServer = false; @@ -98,15 +98,15 @@ public final class FetchHostResponse extends AdminResponse { File gemfireJar = new File(path); File lib = gemfireJar.getParentFile(); File product = lib.getParentFile(); - m.gemfireDir = product.getCanonicalFile();// may thro' IOException if url is not in a proper - // format + m.geodeHomeDir = product.getCanonicalFile();// may thro' IOException if url is not in a proper + // format } catch (Exception ex) { if (dm != null && !dm.getCancelCriterion().isCancelInProgress()) { logger.debug(ex.getMessage(), ex); } m.name = m.name != null ? m.name : DistributionConfig.DEFAULT_NAME; m.host = m.host != null ? m.host : null; - m.gemfireDir = m.gemfireDir != null ? m.gemfireDir : new File(""); + m.geodeHomeDir = m.geodeHomeDir != null ? m.geodeHomeDir : new File(""); m.workingDir = m.workingDir != null ? m.workingDir : new File(System.getProperty("user.dir")).getAbsoluteFile(); } @@ -119,8 +119,8 @@ public final class FetchHostResponse extends AdminResponse { return this.host; } - public File getGemFireDir() { - return this.gemfireDir; + public File getGeodeHomeDir() { + return this.geodeHomeDir; } public File getWorkingDirectory() { @@ -148,7 +148,7 @@ public final class FetchHostResponse extends AdminResponse { super.toData(out); DataSerializer.writeString(this.name, out); DataSerializer.writeObject(this.host, out); - DataSerializer.writeObject(this.gemfireDir, out); + DataSerializer.writeObject(this.geodeHomeDir, out); DataSerializer.writeObject(this.workingDir, out); out.writeLong(this.birthDate); out.writeBoolean(this.isDedicatedCacheServer); @@ -159,7 +159,7 @@ public final class FetchHostResponse extends AdminResponse { super.fromData(in); this.name = DataSerializer.readString(in); this.host = (InetAddress) DataSerializer.readObject(in); - this.gemfireDir = (File) DataSerializer.readObject(in); + this.geodeHomeDir = (File) DataSerializer.readObject(in); this.workingDir = (File) DataSerializer.readObject(in); this.birthDate = in.readLong(); this.isDedicatedCacheServer = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java index d5ff401..9919032 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGemFireVM.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.Properties; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -175,7 +174,7 @@ public abstract class RemoteGemFireVM implements GemFireVM { return this.workingDir; } - public File getGemFireDir() { + public File getGeodeHomeDir() { if (this.gemfireDir == null) { initialize(); } @@ -201,7 +200,7 @@ public abstract class RemoteGemFireVM implements GemFireVM { this.name = response.getName(); this.host = response.getHost(); this.workingDir = response.getWorkingDirectory(); - this.gemfireDir = response.getGemFireDir(); + this.gemfireDir = response.getGeodeHomeDir(); this.birthDate = new Date(response.getBirthDate()); this.isDedicatedCacheServer = Boolean.valueOf(response.isDedicatedCacheServer()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java index 207e21e..ba15508 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/AgentUtil.java @@ -34,7 +34,7 @@ public class AgentUtil { private static final Logger logger = LogService.getLogger(); public static final String ERROR_VARIABLE_NOT_SET = - "The GEMFIRE environment variable must be set!"; + "The GEODE_HOME environment variable must be set!"; private String gemfireVersion = null; @@ -43,24 +43,24 @@ public class AgentUtil { } /** - * this method will try to find the named war files in the following order: 1. if GEMFIRE is + * this method will try to find the named war files in the following order: 1. if GEODE_HOME is * defined, it will look under tools/Extensions, tools/Pulse and lib folder (in this order) to - * find either the name-version.war or the name.war file 2. If GEMFIRE is not defined, it will try - * to find either the name-version.war/name.war (in that order) on the classpath + * find either the name-version.war or the name.war file 2. If GEODE_HOME is not defined, it will + * try to find either the name-version.war/name.war (in that order) on the classpath * * @param warFilePrefix : the prefix of the war file, e.g. geode-web, geode-pulse, or * geode-web-api */ public String findWarLocation(String warFilePrefix) { - String gemfireHome = getGemFireHome(); - if (!StringUtils.isBlank(gemfireHome)) { + String geodeHome = getGeodeHome(); + if (!StringUtils.isBlank(geodeHome)) { String[] possibleFiles = - {gemfireHome + "/tools/Extensions/" + warFilePrefix + "-" + gemfireVersion + ".war", - gemfireHome + "/tools/Pulse/" + warFilePrefix + "-" + gemfireVersion + ".war", - gemfireHome + "/lib/" + warFilePrefix + "-" + gemfireVersion + ".war", - gemfireHome + "/tools/Extensions/" + warFilePrefix + ".war", - gemfireHome + "/tools/Pulse/" + warFilePrefix + ".war", - gemfireHome + "/lib/" + warFilePrefix + ".war"}; + {geodeHome + "/tools/Extensions/" + warFilePrefix + "-" + gemfireVersion + ".war", + geodeHome + "/tools/Pulse/" + warFilePrefix + "-" + gemfireVersion + ".war", + geodeHome + "/lib/" + warFilePrefix + "-" + gemfireVersion + ".war", + geodeHome + "/tools/Extensions/" + warFilePrefix + ".war", + geodeHome + "/tools/Pulse/" + warFilePrefix + ".war", + geodeHome + "/lib/" + warFilePrefix + ".war"}; for (String possibleFile : possibleFiles) { if (new File(possibleFile).isFile()) { logger.info(warFilePrefix + " war found: {}", possibleFile); @@ -69,8 +69,8 @@ public class AgentUtil { } } - // if $GEMFIRE is not set or we are not able to find it in all the possible locations under - // $GEMFIRE, try to + // if $GEODE_HOME is not set or we are not able to find it in all the possible locations under + // $GEODE_HOME, try to // find in the classpath String[] possibleFiles = {warFilePrefix + "-" + gemfireVersion + ".war", "tools/Pulse/" + warFilePrefix + "-" + gemfireVersion + ".war", @@ -104,26 +104,26 @@ public class AgentUtil { return false; } - public String getGemFireHome() { + public String getGeodeHome() { - String gemFireHome = System.getenv("GEMFIRE"); + String geodeHome = System.getenv("GEODE_HOME"); - logger.info("GEMFIRE HOME:" + gemFireHome); + logger.info("GEODE_HOME:" + geodeHome); // Check for empty variable. if empty, then log message and exit HTTP server // startup - if (StringUtils.isBlank(gemFireHome)) { - gemFireHome = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "home"); - logger.info("Reading gemfire.home System Property -> {}", gemFireHome); - if (StringUtils.isBlank(gemFireHome)) { - logger.info("GEMFIRE environment variable not set; HTTP service will not start."); - gemFireHome = null; + if (StringUtils.isBlank(geodeHome)) { + geodeHome = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "home"); + logger.info("Reading gemfire.home System Property -> {}", geodeHome); + if (StringUtils.isBlank(geodeHome)) { + logger.info("GEODE_HOME environment variable not set; HTTP service will not start."); + geodeHome = null; } } - return gemFireHome; + return geodeHome; } public boolean isGemfireHomeDefined() { - String gemfireHome = getGemFireHome(); + String gemfireHome = getGeodeHome(); return !StringUtils.isBlank(gemfireHome); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java index 912d8cc..09d0a67 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java @@ -173,16 +173,16 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { protected static final String ATTACH_API_CLASS_NAME = "com.sun.tools.attach.AttachNotSupportedException"; - protected static final String GEMFIRE_HOME = System.getenv("GEMFIRE"); + protected static final String GEODE_HOME = System.getenv("GEODE_HOME"); protected static final String JAVA_HOME = System.getProperty("java.home"); protected static final String LOCALHOST = "localhost"; // MUST CHANGE THIS TO REGEX SINCE VERSION CHANGES IN JAR NAME - protected static final String GEMFIRE_JAR_PATHNAME = - IOUtils.appendToPath(GEMFIRE_HOME, "lib", GemFireVersion.getGemFireJarFileName()); + protected static final String GEODE_JAR_PATHNAME = + IOUtils.appendToPath(GEODE_HOME, "lib", GemFireVersion.getGemFireJarFileName()); protected static final String CORE_DEPENDENCIES_JAR_PATHNAME = - IOUtils.appendToPath(GEMFIRE_HOME, "lib", "geode-dependencies.jar"); + IOUtils.appendToPath(GEODE_HOME, "lib", "geode-dependencies.jar"); protected static boolean isAttachApiAvailable() { if (ATTACH_API_AVAILABLE.get() == null) { @@ -1182,7 +1182,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { protected String getGemFireJarPath() { String classpath = getSystemClasspath(); - String gemfireJarPath = GEMFIRE_JAR_PATHNAME; + String gemfireJarPath = GEODE_JAR_PATHNAME; for (String classpathElement : classpath.split(File.pathSeparator)) { // MUST CHANGE THIS TO REGEX SINCE VERSION CHANGES IN JAR NAME @@ -2435,12 +2435,12 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { public Result startVsd(@CliOption(key = CliStrings.START_VSD__FILE, help = CliStrings.START_VSD__FILE__HELP) final String[] statisticsArchiveFilePathnames) { try { - String gemfireHome = System.getenv("GEMFIRE"); + String geodeHome = System.getenv("GEODE_HOME"); - assertState(!StringUtils.isBlank(gemfireHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE); + assertState(!StringUtils.isBlank(geodeHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE); assertState(IOUtils.isExistingPathname(getPathToVsd()), - String.format(CliStrings.START_VSD__NOT_FOUND_ERROR_MESSAGE, gemfireHome)); + String.format(CliStrings.START_VSD__NOT_FOUND_ERROR_MESSAGE, geodeHome)); String[] vsdCommandLine = createdVsdCommandLine(statisticsArchiveFilePathnames); @@ -2493,7 +2493,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { protected String getPathToVsd() { String vsdPathname = - IOUtils.appendToPath(System.getenv("GEMFIRE"), "tools", "vsd", "bin", "vsd"); + IOUtils.appendToPath(System.getenv("GEODE_HOME"), "tools", "vsd", "bin", "vsd"); if (SystemUtils.isWindows()) { vsdPathname += ".bat"; @@ -2551,16 +2551,16 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_M_AND_M}) public Result startDataBrowser() { try { - String gemfireHome = System.getenv("GEMFIRE"); + String geodeHome = System.getenv("GEODE_HOME"); - assertState(!StringUtils.isBlank(gemfireHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE); + assertState(!StringUtils.isBlank(geodeHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE); if (isConnectedAndReady() && (getGfsh().getOperationInvoker() instanceof JmxOperationInvoker)) { String dataBrowserPath = getPathToDataBrowser(); assertState(IOUtils.isExistingPathname(dataBrowserPath), - String.format(CliStrings.START_DATABROWSER__NOT_FOUND_ERROR_MESSAGE, gemfireHome)); + String.format(CliStrings.START_DATABROWSER__NOT_FOUND_ERROR_MESSAGE, geodeHome)); JmxOperationInvoker operationInvoker = (JmxOperationInvoker) getGfsh().getOperationInvoker(); @@ -2607,7 +2607,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport { protected String getPathToDataBrowser() { String dataBrowserPathName = - IOUtils.appendToPath(GEMFIRE_HOME, "tools", "DataBrowser", "bin", "databrowser"); + IOUtils.appendToPath(GEODE_HOME, "tools", "DataBrowser", "bin", "databrowser"); if (SystemUtils.isWindows()) { dataBrowserPathName += ".bat"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java index c182116..cc5882a 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java @@ -128,7 +128,7 @@ public class Gfsh extends JLineShell { public static final String ENV_SYS_JAVA_VERSION = "SYS_JAVA_VERSION"; public static final String ENV_SYS_OS = "SYS_OS"; public static final String ENV_SYS_OS_LINE_SEPARATOR = "SYS_OS_LINE_SEPARATOR"; - public static final String ENV_SYS_GEMFIRE_DIR = "SYS_GEMFIRE_DIR"; + public static final String ENV_SYS_GEODE_HOME_DIR = "SYS_GEODE_HOME_DIR"; // TODO merge find a better place for these // SSL Configuration properties. keystore/truststore type is not include @@ -282,7 +282,7 @@ public class Gfsh extends JLineShell { env.put(ENV_SYS_JAVA_VERSION, System.getProperty("java.version")); env.put(ENV_SYS_OS, System.getProperty("os.name")); env.put(ENV_SYS_OS_LINE_SEPARATOR, System.getProperty("line.separator")); - env.put(ENV_SYS_GEMFIRE_DIR, System.getenv("GEMFIRE")); + env.put(ENV_SYS_GEODE_HOME_DIR, System.getenv("GEODE_HOME")); env.put(ENV_APP_NAME, org.apache.geode.management.internal.cli.shell.Gfsh.GFSH_APP_NAME); readonlyAppEnv.add(ENV_APP_NAME); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-docs/tools_modules/gfsh/configuring_gfsh.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/tools_modules/gfsh/configuring_gfsh.html.md.erb b/geode-docs/tools_modules/gfsh/configuring_gfsh.html.md.erb index 1466fc2..3c8d3a7 100644 --- a/geode-docs/tools_modules/gfsh/configuring_gfsh.html.md.erb +++ b/geode-docs/tools_modules/gfsh/configuring_gfsh.html.md.erb @@ -26,7 +26,7 @@ The `gfsh.bat` and `gfsh` bash script automatically append the required Apache G When you start up `gfsh`, it will automatically load required JAR files that have been packaged in the `gfsh-dependencies.jar` file. You do not need to modify your CLASSPATH to run gfsh. When starting servers and locators in gfsh, the start server and start locator commands will load `server-dependencies.jar` and `locator-dependencies.jar` files into the process CLASSPATH for you. -These dependency JAR files are packaged in your Apache Geode installation in the `$GEMFIRE/lib` (or on Windows, the `%GEMFIRE%\lib`) directory. +These dependency JAR files are packaged in your Apache Geode installation in the `$GEMFIRE/lib` (or on Windows, the `%GEODE_HOME%\lib`) directory. **Note:** The `gfsh` command-line utility also searches for `tools.jar` (included with JDK) and adds it to gfsh's CLASSPATH. If you do not have a JDK installed, gfsh uses file-based communication instead for the `status` and `stop` commands. If using a JRE instead of JDK, gfsh must have read-write permissions in the working directory of the server and locator processes. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/440e1650/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java index a9914f3..ae520a2 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java @@ -146,7 +146,7 @@ public class LoginHandlerInterceptorJUnitTest { requestParametersOne.put("param", "one"); requestParametersOne.put(createEnvironmentVariable("STAGE"), "test"); - requestParametersOne.put(createEnvironmentVariable("GEMFIRE"), "/path/to/gemfire/700"); + requestParametersOne.put(createEnvironmentVariable("GEODE_HOME"), "/path/to/gemfire/700"); mockHttpRequestOne = mockContext.mock(HttpServletRequest.class, "testHandlerInterceptorThreadSafety.HttpServletRequest.1"); @@ -159,8 +159,9 @@ public class LoginHandlerInterceptorJUnitTest { will(returnValue(enumeration(requestHeaders.keySet().iterator()))); oneOf(mockHttpRequestOne).getParameter(with(equal(createEnvironmentVariable("STAGE")))); will(returnValue(requestParametersOne.get(createEnvironmentVariable("STAGE")))); - oneOf(mockHttpRequestOne).getParameter(with(equal(createEnvironmentVariable("GEMFIRE")))); - will(returnValue(requestParametersOne.get(createEnvironmentVariable("GEMFIRE")))); + oneOf(mockHttpRequestOne) + .getParameter(with(equal(createEnvironmentVariable("GEODE_HOME")))); + will(returnValue(requestParametersOne.get(createEnvironmentVariable("GEODE_HOME")))); } }); @@ -171,7 +172,7 @@ public class LoginHandlerInterceptorJUnitTest { requestParametersTwo.put("parameter", "two"); requestParametersTwo.put(createEnvironmentVariable("HOST"), "localhost"); - requestParametersTwo.put(createEnvironmentVariable("GEMFIRE"), "/path/to/gemfire/75"); + requestParametersTwo.put(createEnvironmentVariable("GEODE_HOME"), "/path/to/gemfire/75"); mockContext.checking(new Expectations() { { @@ -181,8 +182,9 @@ public class LoginHandlerInterceptorJUnitTest { will(returnValue(enumeration(requestHeaders.keySet().iterator()))); oneOf(mockHttpRequestTwo).getParameter(with(equal(createEnvironmentVariable("HOST")))); will(returnValue(requestParametersTwo.get(createEnvironmentVariable("HOST")))); - oneOf(mockHttpRequestTwo).getParameter(with(equal(createEnvironmentVariable("GEMFIRE")))); - will(returnValue(requestParametersTwo.get(createEnvironmentVariable("GEMFIRE")))); + oneOf(mockHttpRequestTwo) + .getParameter(with(equal(createEnvironmentVariable("GEODE_HOME")))); + will(returnValue(requestParametersTwo.get(createEnvironmentVariable("GEODE_HOME")))); } }); @@ -207,7 +209,7 @@ public class LoginHandlerInterceptorJUnitTest { assertFalse(env.containsKey("parameter")); assertFalse(env.containsKey("HOST")); assertEquals("test", env.get("STAGE")); - assertEquals("/path/to/gemfire/700", env.get("GEMFIRE")); + assertEquals("/path/to/gemfire/700", env.get("GEODE_HOME")); waitForTick(2); @@ -219,7 +221,7 @@ public class LoginHandlerInterceptorJUnitTest { assertFalse(env.containsKey("parameter")); assertFalse(env.containsKey("HOST")); assertEquals("test", env.get("STAGE")); - assertEquals("/path/to/gemfire/700", env.get("GEMFIRE")); + assertEquals("/path/to/gemfire/700", env.get("GEODE_HOME")); waitForTick(4); @@ -231,7 +233,7 @@ public class LoginHandlerInterceptorJUnitTest { assertFalse(env.containsKey("parameter")); assertFalse(env.containsKey("HOST")); assertEquals("test", env.get("STAGE")); - assertEquals("/path/to/gemfire/700", env.get("GEMFIRE")); + assertEquals("/path/to/gemfire/700", env.get("GEODE_HOME")); handlerInterceptor.afterCompletion(mockHttpRequestOne, null, null, null); @@ -260,7 +262,7 @@ public class LoginHandlerInterceptorJUnitTest { assertFalse(env.containsKey("param")); assertFalse(env.containsKey("STAGE")); assertEquals("localhost", env.get("HOST")); - assertEquals("/path/to/gemfire/75", env.get("GEMFIRE")); + assertEquals("/path/to/gemfire/75", env.get("GEODE_HOME")); waitForTick(3);
