Repository: incubator-ignite Updated Branches: refs/heads/ignite-140 1fb0c0afd -> 9616b028c
Ignite-67 IGNITE_JMX_PORT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ffbf59c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ffbf59c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ffbf59c3 Branch: refs/heads/ignite-140 Commit: ffbf59c38beb45d64fb0f1c6b66a806102d8f1b3 Parents: 9aead01 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 15:39:39 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 15:39:39 2015 +0300 ---------------------------------------------------------------------- bin/ggstart.bat | 2 +- bin/ggstart.sh | 2 +- .../ignite/internal/util/portscanner/GridJmxPortFinder.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffbf59c3/bin/ggstart.bat ---------------------------------------------------------------------- diff --git a/bin/ggstart.bat b/bin/ggstart.bat index d18199b..2db610b 100644 --- a/bin/ggstart.bat +++ b/bin/ggstart.bat @@ -125,7 +125,7 @@ set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE% :: :: Find available port for JMX :: -:: You can specify GRIDGAIN_JMX_PORT environment variable for overriding automatically found JMX port +:: 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.gridgain.grid.util.portscanner.GridJmxPortFinder"') do ( set JMX_PORT=%%A http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffbf59c3/bin/ggstart.sh ---------------------------------------------------------------------- diff --git a/bin/ggstart.sh b/bin/ggstart.sh index 250f99a..4e2f37c 100755 --- a/bin/ggstart.sh +++ b/bin/ggstart.sh @@ -67,7 +67,7 @@ RESTART_SUCCESS_OPT="-DIGNITE_SUCCESS_FILE=${RESTART_SUCCESS_FILE}" # # Find available port for JMX # -# You can specify GRIDGAIN_JMX_PORT environment variable for overriding automatically found JMX port +# You can specify IGNITE_JMX_PORT environment variable for overriding automatically found JMX port # findAvailableJmxPort http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffbf59c3/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java index 410cedd..d5925ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java @@ -28,7 +28,7 @@ import java.nio.channels.*; */ public class GridJmxPortFinder { /** Environment variable for overriding JMX port. */ - public static final String GG_JMX_PORT = "GRIDGAIN_JMX_PORT"; + public static final String IGNITE_JMX_PORT = "IGNITE_JMX_PORT"; /** Minimum port number. */ private static final int MIN_PORT = 49112; @@ -59,7 +59,7 @@ public class GridJmxPortFinder { return; } - int jmxPort = IgniteSystemProperties.getInteger(GG_JMX_PORT, -1); + int jmxPort = IgniteSystemProperties.getInteger(IGNITE_JMX_PORT, -1); if (jmxPort != -1) { System.out.println(jmxPort);