geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [2/2] geode git commit: Remove tools.jar from gfsh classpath
Date Wed, 08 Mar 2017 23:49:22 GMT
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 <klund@apache.org>
Authored: Wed Mar 8 15:49:04 2017 -0800
Committer: Kirk Lund <klund@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%"


Mime
View raw message