# ignite_1055
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7030ee19 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7030ee19 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7030ee19 Branch: refs/heads/ignite-1056 Commit: 7030ee191f9e229c73a85cb48e01c8255a53a0cc Parents: b437ec7 Author: Atri <atri.j...@gmail.com> Authored: Mon Jun 29 21:44:01 2015 +0530 Committer: ashutak <ashu...@gridgain.com> Committed: Thu Jul 2 14:05:50 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 8 ++++++-- bin/ignite.sh | 6 +++++- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 +++ .../ignite/startup/cmdline/CommandLineTransformer.java | 9 +++++++++ 5 files changed, 24 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7030ee19/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index 1a4a58c..43cc58b 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -129,8 +129,12 @@ set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE% :: :: You can specify IGNITE_JMX_PORT environment variable for overriding automatically found JMX port :: -for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do ( - set JMX_PORT=%%A +:: This is executed if -nojmx is not specified +:: +if not "%NO_JMX%" == "1" ( + for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do ( + set JMX_PORT=%%A + ) ) :: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7030ee19/bin/ignite.sh ---------------------------------------------------------------------- diff --git a/bin/ignite.sh b/bin/ignite.sh index 660a80f..7fbca57 100755 --- a/bin/ignite.sh +++ b/bin/ignite.sh @@ -71,7 +71,11 @@ RESTART_SUCCESS_OPT="-DIGNITE_SUCCESS_FILE=${RESTART_SUCCESS_FILE}" # # You can specify IGNITE_JMX_PORT environment variable for overriding automatically found JMX port # -findAvailableJmxPort +# This is executed when -nojmx is not specified +# +if [ "${NOJMX}" == "0" ] ; then + findAvailableJmxPort +fi # Mac OS specific support to display correct name in the dock. osname=`uname` http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7030ee19/bin/include/parseargs.bat ---------------------------------------------------------------------- diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat index e8c764a..c4b35d2 100644 --- a/bin/include/parseargs.bat +++ b/bin/include/parseargs.bat @@ -24,6 +24,7 @@ :: QUIET :: NO_PAUSE :: JVM_XOPTS +:: NOJMX :: :: Script setups reasonable defaults (see below) for omitted arguments. :: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7030ee19/bin/include/parseargs.sh ---------------------------------------------------------------------- diff --git a/bin/include/parseargs.sh b/bin/include/parseargs.sh index 8045348..3ab255e 100755 --- a/bin/include/parseargs.sh +++ b/bin/include/parseargs.sh @@ -22,6 +22,7 @@ # INTERACTIVE # QUIET # JVM_XOPTS +# NOJMX # # Script setups reasonable defaults (see below) for omitted arguments. # @@ -35,6 +36,7 @@ CONFIG=${DEFAULT_CONFIG} INTERACTIVE="0" +NOJMX="0" QUIET="-DIGNITE_QUIET=true" JVM_XOPTS="" @@ -42,6 +44,7 @@ while [ $# -gt 0 ] do case "$1" in -i) INTERACTIVE="1";; + -nojmx) NOJMX="1";; -v) QUIET="-DIGNITE_QUIET=false";; -J*) JVM_XOPTS="$JVM_XOPTS ${1:2}";; *) CONFIG="$1";; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7030ee19/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java index 6b2c809..ae0c587 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java @@ -56,6 +56,9 @@ public class CommandLineTransformer { /** No pause mode. */ private boolean noPause; + /** No JMX mode. */ + private boolean noJMX; + /** Supported parameter, parsed manually. */ private String jvmOptions = ""; @@ -132,6 +135,11 @@ public class CommandLineTransformer { break; + case "-nojmx": + noJMX = true; + + break; + default: argsList.add(arg); } @@ -152,6 +160,7 @@ public class CommandLineTransformer { addArgWithValue(sb, "INTERACTIVE", formatBooleanValue(interactive)); addArgWithValue(sb, "QUIET", "-DIGNITE_QUIET=" + !verbose); addArgWithValue(sb, "NO_PAUSE", formatBooleanValue(noPause)); + addArgWithValue(sb, "NO_JMX", formatBooleanValue(noJMX)); parseJvmOptionsAndSpringConfig(args);
