Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EDF73200C42 for ; Fri, 10 Mar 2017 22:34:34 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id ECA89160B67; Fri, 10 Mar 2017 21:34:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 46FA1160B82 for ; Fri, 10 Mar 2017 22:34:34 +0100 (CET) Received: (qmail 88093 invoked by uid 500); 10 Mar 2017 21:34:33 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 88000 invoked by uid 99); 10 Mar 2017 21:34:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 21:34:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 43AD4DFF46; Fri, 10 Mar 2017 21:34:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: khowe@apache.org To: commits@geode.apache.org Date: Fri, 10 Mar 2017 21:34:36 -0000 Message-Id: <71e5686de3884e3ab6b24bfe8665c18b@git.apache.org> In-Reply-To: <4281d12c4d0d449ca715eb12679b00e3@git.apache.org> References: <4281d12c4d0d449ca715eb12679b00e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] geode git commit: Remove tools.jar from gfsh classpath archived-at: Fri, 10 Mar 2017 21:34:35 -0000 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-2599 Commit: adf275fe9373613eb9a5eed9d7b60bfa1748a83e Parents: f3424ff Author: Kirk Lund Authored: Wed Mar 8 15:49:04 2017 -0800 Committer: Kirk Lund 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%"