You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/03/08 23:49:21 UTC
[1/2] geode git commit: Deprecate --pid option for status and stop
commands
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2594 c2a8fc3a7 -> adf275fe9
Deprecate --pid option for status and stop commands
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f3424ffb
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f3424ffb
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f3424ffb
Branch: refs/heads/feature/GEODE-2594
Commit: f3424ffbc7b1849c3fb02a25c677567de5ee86d1
Parents: c2a8fc3
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Mar 8 15:48:37 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed Mar 8 15:48:37 2017 -0800
----------------------------------------------------------------------
.../geode/management/internal/cli/i18n/CliStrings.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/f3424ffb/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index 7696aa8..9b1477d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -2721,7 +2721,8 @@ public class CliStrings {
public static final String STATUS_LOCATOR__MEMBER__HELP =
"Member name or ID of the Locator in the Geode cluster.";
public static final String STATUS_LOCATOR__PID = "pid";
- public static final String STATUS_LOCATOR__PID__HELP = "Process ID (PID) of the running Locator.";
+ public static final String STATUS_LOCATOR__PID__HELP =
+ "Process ID (PID) of the running Locator. Deprecated: Since Geode1.2, use --dir instead.";
public static final String STATUS_LOCATOR__PORT = "port";
public static final String STATUS_LOCATOR__PORT__HELP =
"Port on which the Locator is listening. The default is 10334.";
@@ -2745,7 +2746,7 @@ public class CliStrings {
"No Geode Cache Server with member name or ID {0} could be found.";
public static final String STATUS_SERVER__PID = "pid";
public static final String STATUS_SERVER__PID__HELP =
- "Process ID (PID) of the running Geode Cache Server.";
+ "Process ID (PID) of the running Geode Cache Server. Deprecated: Since Geode1.2, use --dir instead.";
/* stop gateway-reciver */
public static final String STOP_GATEWAYRECEIVER = "stop gateway-receiver";
@@ -2782,7 +2783,7 @@ public class CliStrings {
"Member name or ID of the Locator in the Geode cluster.";
public static final String STOP_LOCATOR__PID = "pid";
public static final String STOP_LOCATOR__PID__HELP =
- "The process id (PID) of the running Locator.";
+ "The process id (PID) of the running Locator. Deprecated: Since Geode1.2, use --dir instead.";
public static final String STOP_LOCATOR__GENERAL_ERROR_MESSAGE =
"An error occurred while attempting to stop a Locator: %1$s";
public static final String STOP_LOCATOR__LOCATOR_IS_CACHE_SERVER_ERROR_MESSAGE =
@@ -2813,7 +2814,7 @@ public class CliStrings {
"No Cache Server with member name or ID {0} could be found.";
public static final String STOP_SERVER__PID = "pid";
public static final String STOP_SERVER__PID__HELP =
- "Process ID (PID) of the running Geode Cache Server.";
+ "Process ID (PID) of the running Geode Cache Server. Deprecated: Since Geode1.2, use --dir instead.";
public static final String STOP_SERVER__SHUTDOWN_MEMBER_MESSAGE =
"Cache Server {0} has been requested to stop.";
public static final String STOP_SERVER__STOPPING_SERVER_MESSAGE =
[2/2] geode git commit: Remove tools.jar from gfsh classpath
Posted by kl...@apache.org.
Remove tools.jar from gfsh classpath
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/adf275fe
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/adf275fe
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/adf275fe
Branch: refs/heads/feature/GEODE-2594
Commit: adf275fe9373613eb9a5eed9d7b60bfa1748a83e
Parents: f3424ff
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Mar 8 15:49:04 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed Mar 8 15:49:04 2017 -0800
----------------------------------------------------------------------
geode-assembly/src/main/dist/bin/gfsh | 14 --------------
geode-assembly/src/main/dist/bin/gfsh.bat | 8 --------
2 files changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/adf275fe/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 309723e..51533c3 100755
--- a/geode-assembly/src/main/dist/bin/gfsh
+++ b/geode-assembly/src/main/dist/bin/gfsh
@@ -110,20 +110,6 @@ if [ "x$GF_JAVA_PATH" == "x" ]; then
echo "ERROR: Could not find java executable in the path. Please set JAVA_HOME to point to the JDK directory or point GF_JAVA to java executable from JDK."
exit 1
fi
-GF_JAVA_PARENT=`dirname "$GF_JAVA_PATH"`
-GF_JAVA_PARENT=`dirname "$GF_JAVA_PARENT"`
-TOOLS_JAR="$GF_JAVA_PARENT/lib/tools.jar"
-if [ ! -f "$TOOLS_JAR" ]; then
- # Now consider java is from JRE in JDK
- TOOLS_JAR="$GF_JAVA_PARENT/../lib/tools.jar"
- if [ ! -f "$TOOLS_JAR" ]; then
- TOOLS_JAR=
- fi
-fi
-
-if [ "x$TOOLS_JAR" != "x" ]; then
- CLASSPATH="$CLASSPATH:$TOOLS_JAR"
-fi
if [ "${UNAME}" = "cygwin" ]; then
CLASSPATH=$( cygpath -w -p "$CLASSPATH" )
http://git-wip-us.apache.org/repos/asf/geode/blob/adf275fe/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 5a40141..b55ffd7 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -68,14 +68,6 @@ REM @if not exist "%USERPROFILE%\.gemfire" (
REM @mkdir "%USERPROFILE%\.gemfire"
REM )
-REM Expect to find the tools.jar from the JDK
-@set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
-@IF EXIST "%TOOLS_JAR%" (
- @set DEPENDENCIES=%DEPENDENCIES%;%TOOLS_JAR%
-) ELSE (
- set TOOLS_JAR=
-)
-
@set LAUNCHER=org.apache.geode.management.internal.cli.Launcher
@if defined JAVA_ARGS (
@set JAVA_ARGS="%JAVA_ARGS%"