Ignite-67 Most of const values fixed at IgniteSystemProperties
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77efad96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77efad96 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77efad96 Branch: refs/heads/sprint-1 Commit: 77efad96287be8df139f79d0547f4b72b5567faf Parents: 5600ac3 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Jan 27 19:37:15 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Jan 27 19:37:15 2015 +0300 ---------------------------------------------------------------------- bin/ggstart.bat | 6 +- bin/ggstart.sh | 18 +- bin/ggvisorcmd.bat | 4 +- bin/ggvisorcmd.sh | 8 +- bin/include/parseargs.sh | 4 +- bin/include/service.sh | 4 +- modules/clients/src/test/bin/start-nodes.cmd | 2 +- modules/clients/src/test/bin/start-nodes.sh | 2 +- .../src/test/resources/jetty/rest-jetty-ssl.xml | 10 +- .../src/test/resources/jetty/rest-jetty.xml | 8 +- .../test/resources/jetty/router-jetty-ssl.xml | 8 +- .../src/test/resources/jetty/router-jetty.xml | 8 +- .../src/test/resources/spring-router-ssl.xml | 2 +- .../src/test/resources/spring-router.xml | 2 +- .../java/org/apache/ignite/IgniteLogger.java | 2 +- .../apache/ignite/IgniteSystemProperties.java | 122 +- .../org/apache/ignite/internal/GridGainEx.java | 2 +- .../org/apache/ignite/internal/GridKernal.java | 2 +- .../jobmetrics/GridJobMetricsProcessor.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 8 +- .../java/IgniteJavaLoggerFileHandler.java | 2 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../startup/cmdline/CommandLineTransformer.java | 2 +- .../startup/GridRandomCommandLineLoader.java | 4 +- .../ignite/startup/GridVmNodesStarter.java | 4 +- .../GridCommandLineTransformerSelfTest.java | 6 +- .../src/test/resources/log/gridgain.log.tst | 2286 +++++++++--------- .../logger/log4j/IgniteLog4jNodeIdFilePath.java | 4 +- .../http/jetty/GridJettyRestProtocol.java | 2 +- 29 files changed, 1268 insertions(+), 1268 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/bin/ggstart.bat ---------------------------------------------------------------------- diff --git a/bin/ggstart.bat b/bin/ggstart.bat index e05de82..73297e5 100644 --- a/bin/ggstart.bat +++ b/bin/ggstart.bat @@ -120,7 +120,7 @@ set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% org.apache.ignite. for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set RANDOM_NUMBER=%%i set RESTART_SUCCESS_FILE="%GRIDGAIN_HOME%\work\ignite_success_%RANDOM_NUMBER%" -set RESTART_SUCCESS_OPT=-DGRIDGAIN_SUCCESS_FILE=%RESTART_SUCCESS_FILE% +set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE% :: :: Find available port for JMX @@ -198,11 +198,11 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.Command if "%INTERACTIVE%" == "1" ( "%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DGRIDGAIN_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^ + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DIGNITE_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^ -cp "%CP%" %MAIN_CLASS% ) else ( "%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DGRIDGAIN_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^ + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DIGNITE_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^ -cp "%CP%" %MAIN_CLASS% "%CONFIG%" ) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/bin/ggstart.sh ---------------------------------------------------------------------- diff --git a/bin/ggstart.sh b/bin/ggstart.sh index 70d6eba..0be0635 100755 --- a/bin/ggstart.sh +++ b/bin/ggstart.sh @@ -62,7 +62,7 @@ CP="${GRIDGAIN_LIBS}" RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator) RESTART_SUCCESS_FILE="${GRIDGAIN_HOME}/work/ignite_success_${RANDOM_NUMBER}" -RESTART_SUCCESS_OPT="-DGRIDGAIN_SUCCESS_FILE=${RESTART_SUCCESS_FILE}" +RESTART_SUCCESS_OPT="-DIGNITE_SUCCESS_FILE=${RESTART_SUCCESS_FILE}" # # Find available port for JMX @@ -138,26 +138,26 @@ do case $osname in Darwin*) "$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" "${RESTART_SUCCESS_OPT}" ${JMX_MON} \ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ - -DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ + -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} ;; *) "$JAVA" ${JVM_OPTS} ${QUIET} "${RESTART_SUCCESS_OPT}" ${JMX_MON} \ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ - -DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ + -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} ;; esac else case $osname in Darwin*) "$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" "${RESTART_SUCCESS_OPT}" ${JMX_MON} \ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ - -DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}" + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ + -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}" ;; *) "$JAVA" ${JVM_OPTS} ${QUIET} "${RESTART_SUCCESS_OPT}" ${JMX_MON} \ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ - -DGRIDGAIN_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}" + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ + -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}" ;; esac fi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/bin/ggvisorcmd.bat ---------------------------------------------------------------------- diff --git a/bin/ggvisorcmd.bat b/bin/ggvisorcmd.bat index 3088124..3614cc4 100644 --- a/bin/ggvisorcmd.bat +++ b/bin/ggvisorcmd.bat @@ -133,8 +133,8 @@ if %ENABLE_ASSERTIONS% == 1 set JVM_OPTS_VISOR=%JVM_OPTS_VISOR% -ea :: :: Starts Visor console. :: -"%JAVA_HOME%\bin\java.exe" %JVM_OPTS_VISOR% -DGRIDGAIN_PROG_NAME="%PROG_NAME%" ^ --DGRIDGAIN_DEPLOYMENT_MODE_OVERRIDE=ISOLATED %QUIET% %JVM_XOPTS% -cp "%CP%" ^ +"%JAVA_HOME%\bin\java.exe" %JVM_OPTS_VISOR% -DIGNITE_PROG_NAME="%PROG_NAME%" ^ +-DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED %QUIET% %JVM_XOPTS% -cp "%CP%" ^ org.gridgain.visor.commands.VisorConsole :error_finish http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/bin/ggvisorcmd.sh ---------------------------------------------------------------------- diff --git a/bin/ggvisorcmd.sh b/bin/ggvisorcmd.sh index 6fe6c55..86b7135 100755 --- a/bin/ggvisorcmd.sh +++ b/bin/ggvisorcmd.sh @@ -106,13 +106,13 @@ trap restoreSttySettings INT case $osname in Darwin*) "$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" \ - -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DGRIDGAIN_PROG_NAME="$0" \ - -DGRIDGAIN_DEPLOYMENT_MODE_OVERRIDE=ISOLATED ${JVM_XOPTS} -cp "${CP}" \ + -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DIGNITE_PROG_NAME="$0" \ + -DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED ${JVM_XOPTS} -cp "${CP}" \ org.apache.ignite.visor.commands.VisorConsole ;; *) - "$JAVA" ${JVM_OPTS} ${QUIET} -DGRIDGAIN_UPDATE_NOTIFIER=false \ - -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DGRIDGAIN_PROG_NAME="$0" -DGRIDGAIN_DEPLOYMENT_MODE_OVERRIDE=ISOLATED \ + "$JAVA" ${JVM_OPTS} ${QUIET} -DIGNITE_UPDATE_NOTIFIER=false \ + -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DIGNITE_PROG_NAME="$0" -DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED \ ${JVM_XOPTS} -cp "${CP}" \ org.apache.ignite.visor.commands.VisorConsole ;; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/bin/include/parseargs.sh ---------------------------------------------------------------------- diff --git a/bin/include/parseargs.sh b/bin/include/parseargs.sh index 950ce42..e9f0ea6 100755 --- a/bin/include/parseargs.sh +++ b/bin/include/parseargs.sh @@ -33,14 +33,14 @@ CONFIG=${DEFAULT_CONFIG} INTERACTIVE="0" -QUIET="-DGRIDGAIN_QUIET=true" +QUIET="-DIGNITE_QUIET=true" JVM_XOPTS="" while [ $# -gt 0 ] do case "$1" in -i) INTERACTIVE="1";; - -v) QUIET="-DGRIDGAIN_QUIET=false";; + -v) QUIET="-DIGNITE_QUIET=false";; -J*) JVM_XOPTS="$JVM_XOPTS ${1:2}";; *) CONFIG="$1";; esac http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/bin/include/service.sh ---------------------------------------------------------------------- diff --git a/bin/include/service.sh b/bin/include/service.sh index a5e77c1..8b9eb1a 100755 --- a/bin/include/service.sh +++ b/bin/include/service.sh @@ -65,8 +65,8 @@ case "$1" in checkJava # And run. - $JAVA $JVM_OPTS -DGRIDGAIN_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ - -DGRIDGAIN_PROG_NAME="$0" -cp "$GRIDGAIN_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" &>/dev/null & + $JAVA $JVM_OPTS -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \ + -DIGNITE_PROG_NAME="$0" -cp "$GRIDGAIN_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" &>/dev/null & # Write process id. echo $! >$PIDFILE http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/bin/start-nodes.cmd ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/bin/start-nodes.cmd b/modules/clients/src/test/bin/start-nodes.cmd index b0ddc09..ad21637 100644 --- a/modules/clients/src/test/bin/start-nodes.cmd +++ b/modules/clients/src/test/bin/start-nodes.cmd @@ -43,7 +43,7 @@ echo Wait 60 seconds while nodes started. ping -n 60 127.0.0.1 > NUL rem Disable hostname verification for self-signed certificates. -set JVM_OPTS=%JVM_OPTS% -DGRIDGAIN_DISABLE_HOSTNAME_VERIFIER=true +set JVM_OPTS=%JVM_OPTS% -DIGNITE_DISABLE_HOSTNAME_VERIFIER=true FOR /L %%G IN (1,1,1) DO start "Router #%%G" /low /MIN cmd /C "%BIN_PATH%\ggrouter.bat -v %CONFIG_DIR%\spring-router.xml >> %GG_HOME%\work\log\router-%%G.log 2>&1" FOR /L %%G IN (1,1,1) DO start "SSL Router #%%G" /low /MIN cmd /C "%BIN_PATH%\ggrouter.bat -v %CONFIG_DIR%\spring-router-ssl.xml >> %GG_HOME%\work\log\router-ssl-%%G.log 2>&1" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/bin/start-nodes.sh ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/bin/start-nodes.sh b/modules/clients/src/test/bin/start-nodes.sh index 854e0ba..f74b0bb 100644 --- a/modules/clients/src/test/bin/start-nodes.sh +++ b/modules/clients/src/test/bin/start-nodes.sh @@ -82,7 +82,7 @@ echo Start Router: ${LOG_FILE} nohup /bin/bash $BIN_PATH/ggrouter.sh $CONFIG_DIR/spring-router.xml -v < /dev/null > ${LOG_FILE} 2>&1 & # Disable hostname verification for self-signed certificates. -export JVM_OPTS="${JVM_OPTS} -DGRIDGAIN_DISABLE_HOSTNAME_VERIFIER=true" +export JVM_OPTS="${JVM_OPTS} -DIGNITE_DISABLE_HOSTNAME_VERIFIER=true" LOG_FILE=${GG_HOME}/work/log/router-ssl.log echo Start Router SSL: ${LOG_FILE} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/resources/jetty/rest-jetty-ssl.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/jetty/rest-jetty-ssl.xml b/modules/clients/src/test/resources/jetty/rest-jetty-ssl.xml index 1a7b36d..c55f06f 100644 --- a/modules/clients/src/test/resources/jetty/rest-jetty-ssl.xml +++ b/modules/clients/src/test/resources/jetty/rest-jetty-ssl.xml @@ -30,7 +30,7 @@ <New id="httpsCfg" class="org.eclipse.jetty.server.HttpConfiguration"> <Set name="secureScheme">https</Set> - <Set name="securePort"><SystemProperty name="GRIDGAIN_JETTY_PORT" default="11443"/></Set> + <Set name="securePort"><SystemProperty name="IGNITE_JETTY_PORT" default="11443"/></Set> <Set name="sendServerVersion">true</Set> <Set name="sendDateHeader">true</Set> <Call name="addCustomizer"> @@ -67,11 +67,11 @@ </Arg> <!-- Note that in order to override local host and port values, - system properties must have names GRIDGAIN_JETTY_HOST and - GRIDGAIN_JETTY_PORT accordingly. + system properties must have names IGNITE_JETTY_HOST and + IGNITE_JETTY_PORT accordingly. --> - <Set name="host"><SystemProperty name="GRIDGAIN_JETTY_HOST" default="127.0.0.1"/></Set> - <Set name="port"><SystemProperty name="GRIDGAIN_JETTY_PORT" default="11443"/></Set> + <Set name="host"><SystemProperty name="IGNITE_JETTY_HOST" default="127.0.0.1"/></Set> + <Set name="port"><SystemProperty name="IGNITE_JETTY_PORT" default="11443"/></Set> <Set name="idleTimeout">30000</Set> <Set name="reuseAddress">true</Set> </New> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/resources/jetty/rest-jetty.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/jetty/rest-jetty.xml b/modules/clients/src/test/resources/jetty/rest-jetty.xml index b4efe7c..268dfa2 100644 --- a/modules/clients/src/test/resources/jetty/rest-jetty.xml +++ b/modules/clients/src/test/resources/jetty/rest-jetty.xml @@ -50,11 +50,11 @@ </Arg> <!-- Note that in order to override local host and port values, - system properties must have names GRIDGAIN_JETTY_HOST and - GRIDGAIN_JETTY_PORT accordingly. + system properties must have names IGNITE_JETTY_HOST and + IGNITE_JETTY_PORT accordingly. --> - <Set name="host"><SystemProperty name="GRIDGAIN_JETTY_HOST" default="localhost"/></Set> - <Set name="port"><SystemProperty name="GRIDGAIN_JETTY_PORT" default="11080"/></Set> + <Set name="host"><SystemProperty name="IGNITE_JETTY_HOST" default="localhost"/></Set> + <Set name="port"><SystemProperty name="IGNITE_JETTY_PORT" default="11080"/></Set> <Set name="idleTimeout">30000</Set> <Set name="reuseAddress">true</Set> </New> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/resources/jetty/router-jetty-ssl.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/jetty/router-jetty-ssl.xml b/modules/clients/src/test/resources/jetty/router-jetty-ssl.xml index b8ea38f..91f0c68 100644 --- a/modules/clients/src/test/resources/jetty/router-jetty-ssl.xml +++ b/modules/clients/src/test/resources/jetty/router-jetty-ssl.xml @@ -30,7 +30,7 @@ <New id="httpsCfg" class="org.eclipse.jetty.server.HttpConfiguration"> <Set name="secureScheme">https</Set> - <Set name="securePort"><SystemProperty name="GRIDGAIN_JETTY_PORT" default="12400"/></Set> + <Set name="securePort"><SystemProperty name="IGNITE_JETTY_PORT" default="12400"/></Set> <Set name="sendServerVersion">true</Set> <Set name="sendDateHeader">true</Set> <Call name="addCustomizer"> @@ -67,11 +67,11 @@ </Arg> <!-- Note that in order to override local host and port values, - system properties must have names GRIDGAIN_JETTY_HOST and - GRIDGAIN_JETTY_PORT accordingly. + system properties must have names IGNITE_JETTY_HOST and + IGNITE_JETTY_PORT accordingly. --> <Set name="host">127.0.0.1</Set> - <Set name="port"><SystemProperty name="GRIDGAIN_JETTY_PORT" default="12400"/></Set> + <Set name="port"><SystemProperty name="IGNITE_JETTY_PORT" default="12400"/></Set> <Set name="idleTimeout">30000</Set> <Set name="reuseAddress">true</Set> </New> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/resources/jetty/router-jetty.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/jetty/router-jetty.xml b/modules/clients/src/test/resources/jetty/router-jetty.xml index 813a6f7..a229aa3 100644 --- a/modules/clients/src/test/resources/jetty/router-jetty.xml +++ b/modules/clients/src/test/resources/jetty/router-jetty.xml @@ -50,11 +50,11 @@ </Arg> <!-- Note that in order to override local host and port values, - system properties must have names GRIDGAIN_JETTY_HOST and - GRIDGAIN_JETTY_PORT accordingly. + system properties must have names IGNITE_JETTY_HOST and + IGNITE_JETTY_PORT accordingly. --> - <Set name="host"><SystemProperty name="GRIDGAIN_JETTY_HOST" default="localhost"/></Set> - <Set name="port"><SystemProperty name="GRIDGAIN_JETTY_PORT" default="12200"/></Set> + <Set name="host"><SystemProperty name="IGNITE_JETTY_HOST" default="localhost"/></Set> + <Set name="port"><SystemProperty name="IGNITE_JETTY_PORT" default="12200"/></Set> <Set name="idleTimeout">30000</Set> <Set name="reuseAddress">true</Set> </New> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/resources/spring-router-ssl.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-router-ssl.xml b/modules/clients/src/test/resources/spring-router-ssl.xml index ae8d7b5..ad22064 100644 --- a/modules/clients/src/test/resources/spring-router-ssl.xml +++ b/modules/clients/src/test/resources/spring-router-ssl.xml @@ -55,7 +55,7 @@ <property name="targetMethod" value="putAll"/> <property name="arguments"> <map> - <entry key="GRIDGAIN_JETTY_PORT" value="12400"/> + <entry key="IGNITE_JETTY_PORT" value="12400"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/clients/src/test/resources/spring-router.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-router.xml b/modules/clients/src/test/resources/spring-router.xml index 706494f..602a6e0 100644 --- a/modules/clients/src/test/resources/spring-router.xml +++ b/modules/clients/src/test/resources/spring-router.xml @@ -57,7 +57,7 @@ <property name="targetMethod" value="putAll"/> <property name="arguments"> <map> - <entry key="GRIDGAIN_JETTY_PORT" value="12200"/> + <entry key="IGNITE_JETTY_PORT" value="12200"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java index 1a6efb7..aa304e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java @@ -56,7 +56,7 @@ import org.jetbrains.annotations.*; * injection. * <h1 class="header">Quiet Mode</h1> * By default GridGain 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG} - * log output. If system property {@code GRIDGAIN_QUIET} is set to {@code false} than GridGain + * log output. If system property {@code IGNITE_QUIET} is set to {@code false} than GridGain * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is * done through standard output (STDOUT). * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index d35f8f9..b54275c 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -30,26 +30,26 @@ public final class IgniteSystemProperties { /** * If this system property is present the GridGain will include grid name into verbose log. */ - public static final String GG_LOG_GRID_NAME = "GRIDGAIN_LOG_GRID_NAME"; + public static final String GG_LOG_GRID_NAME = "IGNITE_LOG_GRID_NAME"; /** * This property is used internally to pass an exit code to loader when * GridGain instance is being restarted. */ - public static final String GG_RESTART_CODE = "GRIDGAIN_RESTART_CODE"; + public static final String GG_RESTART_CODE = "IGNITE_RESTART_CODE"; /** * Presence of this system property with value {@code true} will make the grid * node start as a daemon node. Node that this system property will override * {@link org.apache.ignite.configuration.IgniteConfiguration#isDaemon()} configuration. */ - public static final String GG_DAEMON = "GRIDGAIN_DAEMON"; + public static final String GG_DAEMON = "IGNITE_DAEMON"; /** Defines GridGain installation folder. */ public static final String GG_HOME = "GRIDGAIN_HOME"; /** If this system property is set to {@code false} - no shutdown hook will be set. */ - public static final String GG_NO_SHUTDOWN_HOOK = "GRIDGAIN_NO_SHUTDOWN_HOOK"; + public static final String GG_NO_SHUTDOWN_HOOK = "IGNITE_NO_SHUTDOWN_HOOK"; /** * Name of the system property to disable requirement for proper node ordering @@ -59,7 +59,7 @@ public final class IgniteSystemProperties { * {@link org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport @GridDiscoverySpiOrderSupport(true)} will * be allowed. */ - public static final String GG_NO_DISCO_ORDER = "GRIDGAIN_NO_DISCO_ORDER"; + public static final String GG_NO_DISCO_ORDER = "IGNITE_NO_DISCO_ORDER"; /** * If this system property is set to {@code false} - no checks for new versions will @@ -67,47 +67,47 @@ public final class IgniteSystemProperties { * version and prints out the message into the log if new version of GridGain is * available for download. */ - public static final String GG_UPDATE_NOTIFIER = "GRIDGAIN_UPDATE_NOTIFIER"; + public static final String GG_UPDATE_NOTIFIER = "IGNITE_UPDATE_NOTIFIER"; /** * This system property defines interval in milliseconds in which GridGain will check * thread pool state for starvation. Zero value will disable this checker. */ - public static final String GG_STARVATION_CHECK_INTERVAL = "GRIDGAIN_STARVATION_CHECK_INTERVAL"; + public static final String GG_STARVATION_CHECK_INTERVAL = "IGNITE_STARVATION_CHECK_INTERVAL"; /** * If this system property is present (any value) - no ASCII logo will * be printed. */ - public static final String GG_NO_ASCII = "GRIDGAIN_NO_ASCII"; + public static final String GG_NO_ASCII = "IGNITE_NO_ASCII"; /** * This property allows to override Jetty host for REST processor. */ - public static final String GG_JETTY_HOST = "GRIDGAIN_JETTY_HOST"; + public static final String GG_JETTY_HOST = "IGNITE_JETTY_HOST"; /** * This property allows to override Jetty local port for REST processor. */ - public static final String GG_JETTY_PORT = "GRIDGAIN_JETTY_PORT"; + public static final String GG_JETTY_PORT = "IGNITE_JETTY_PORT"; /** * This property does not allow GridGain to override Jetty log configuration for REST processor. */ - public static final String GG_JETTY_LOG_NO_OVERRIDE = "GRIDGAIN_JETTY_LOG_NO_OVERRIDE"; + public static final String GG_JETTY_LOG_NO_OVERRIDE = "IGNITE_JETTY_LOG_NO_OVERRIDE"; /** * This property allows to override maximum count of task results stored on one node * in REST processor. */ - public static final String GG_REST_MAX_TASK_RESULTS = "GRIDGAIN_REST_MAX_TASK_RESULTS"; + public static final String GG_REST_MAX_TASK_RESULTS = "IGNITE_REST_MAX_TASK_RESULTS"; /** * This property defines the maximum number of attempts to remap near get to the same * primary node. Remapping may be needed when topology is changed concurrently with * get operation. */ - public static final String GG_NEAR_GET_MAX_REMAPS = "GRIDGAIN_NEAR_GET_MAX_REMAPS"; + public static final String GG_NEAR_GET_MAX_REMAPS = "IGNITE_NEAR_GET_MAX_REMAPS"; /** * Set to either {@code true} or {@code false} to enable or disable quiet mode @@ -117,7 +117,7 @@ public final class IgniteSystemProperties { * Note that if you use <tt>ggstart.{sh|bat}</tt> scripts to start GridGain they * start by default in quiet mode. You can supply <tt>-v</tt> flag to override it. */ - public static final String GG_QUIET = "GRIDGAIN_QUIET"; + public static final String GG_QUIET = "IGNITE_QUIET"; /** * If this property is set to {@code true} (default) and GridGain is launched @@ -125,19 +125,19 @@ public final class IgniteSystemProperties { * in configuration, then default console appender will be added. * Set this property to {@code false} if no appenders should be added. */ - public static final String GG_CONSOLE_APPENDER = "GRIDGAIN_CONSOLE_APPENDER"; + public static final String GG_CONSOLE_APPENDER = "IGNITE_CONSOLE_APPENDER"; /** * Name of the system property defining name of command line program. */ - public static final String GG_PROG_NAME = "GRIDGAIN_PROG_NAME"; + public static final String GG_PROG_NAME = "IGNITE_PROG_NAME"; /** * Name of the system property defining success file name. This file * is used with auto-restarting functionality when GridGain is started * by supplied <tt>ggstart.{bat|sh}</tt> scripts. */ - public static final String GG_SUCCESS_FILE = "GRIDGAIN_SUCCESS_FILE"; + public static final String GG_SUCCESS_FILE = "IGNITE_SUCCESS_FILE"; /** * Name of the system property or environment variable to set or override @@ -150,7 +150,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpHost() */ - public static final String GG_SMTP_HOST = "GRIDGAIN_SMTP_HOST"; + public static final String GG_SMTP_HOST = "IGNITE_SMTP_HOST"; /** * Name of the system property or environment variable to set or override @@ -164,7 +164,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPort() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_PORT */ - public static final String GG_SMTP_PORT = "GRIDGAIN_SMTP_PORT"; + public static final String GG_SMTP_PORT = "IGNITE_SMTP_PORT"; /** * Name of the system property or environment variable to set or override @@ -177,7 +177,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpUsername() */ - public static final String GG_SMTP_USERNAME = "GRIDGAIN_SMTP_USERNAME"; + public static final String GG_SMTP_USERNAME = "IGNITE_SMTP_USERNAME"; /** * Name of the system property or environment variable to set or override @@ -190,7 +190,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpPassword() */ - public static final String GG_SMTP_PWD = "GRIDGAIN_SMTP_PASSWORD"; + public static final String GG_SMTP_PWD = "IGNITE_SMTP_PASSWORD"; /** * Name of the system property or environment variable to set or override @@ -204,7 +204,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#getSmtpFromEmail() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_FROM_EMAIL */ - public static final String GG_SMTP_FROM = "GRIDGAIN_SMTP_FROM"; + public static final String GG_SMTP_FROM = "IGNITE_SMTP_FROM"; /** * Name of the system property or environment variable to set or override @@ -218,7 +218,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#getAdminEmails() */ - public static final String GG_ADMIN_EMAILS = "GRIDGAIN_ADMIN_EMAILS"; + public static final String GG_ADMIN_EMAILS = "IGNITE_ADMIN_EMAILS"; /** * Name of the system property or environment variable to set or override @@ -233,7 +233,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpSsl() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_SSL */ - public static final String GG_SMTP_SSL = "GRIDGAIN_SMTP_SSL"; + public static final String GG_SMTP_SSL = "IGNITE_SMTP_SSL"; /** * Name of the system property or environment variable to set or override @@ -242,7 +242,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.configuration.IgniteConfiguration#isLifeCycleEmailNotification() */ - public static final String GG_LIFECYCLE_EMAIL_NOTIFY = "GRIDGAIN_LIFECYCLE_EMAIL_NOTIFY"; + public static final String GG_LIFECYCLE_EMAIL_NOTIFY = "IGNITE_LIFECYCLE_EMAIL_NOTIFY"; /** * Name of the system property or environment variable to set or override @@ -257,7 +257,7 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteConfiguration#isSmtpStartTls() * @see org.apache.ignite.configuration.IgniteConfiguration#DFLT_SMTP_STARTTLS */ - public static final String GG_SMTP_STARTTLS = "GRIDGAIN_SMTP_STARTTLS"; + public static final String GG_SMTP_STARTTLS = "IGNITE_SMTP_STARTTLS"; /** * Name of system property to set system-wide local IP address or host. If provided it will @@ -267,7 +267,7 @@ public final class IgniteSystemProperties { * method. However, system properties have priority over configuration properties specified in * {@link org.apache.ignite.configuration.IgniteConfiguration}. */ - public static final String GG_LOCAL_HOST = "GRIDGAIN_LOCAL_HOST"; + public static final String GG_LOCAL_HOST = "IGNITE_LOCAL_HOST"; /** * Name of the system property or environment variable to activate synchronous @@ -277,7 +277,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.lang.IgniteFuture#syncNotify() */ - public static final String GG_FUT_SYNC_NOTIFICATION = "GRIDGAIN_FUTURE_SYNC_NOTIFICATION"; + public static final String GG_FUT_SYNC_NOTIFICATION = "IGNITE_FUTURE_SYNC_NOTIFICATION"; /** * Name of the system property or environment variable to activate concurrent @@ -287,7 +287,7 @@ public final class IgniteSystemProperties { * * @see org.apache.ignite.lang.IgniteFuture#concurrentNotify() */ - public static final String GG_FUT_CONCURRENT_NOTIFICATION = "GRIDGAIN_FUTURE_CONCURRENT_NOTIFICATION"; + public static final String GG_FUT_CONCURRENT_NOTIFICATION = "IGNITE_FUTURE_CONCURRENT_NOTIFICATION"; /** * System property to override deployment mode configuration parameter. @@ -296,165 +296,165 @@ public final class IgniteSystemProperties { * @see org.apache.ignite.configuration.IgniteDeploymentMode * @see org.apache.ignite.configuration.IgniteConfiguration#getDeploymentMode() */ - public static final String GG_DEP_MODE_OVERRIDE = "GRIDGAIN_DEPLOYMENT_MODE_OVERRIDE"; + public static final String GG_DEP_MODE_OVERRIDE = "IGNITE_DEPLOYMENT_MODE_OVERRIDE"; /** * Property controlling size of buffer holding completed transaction versions. Such buffer * is used to detect duplicate transaction and has a default value of {@code 102400}. In * most cases this value is large enough and does not need to be changed. */ - public static final String GG_MAX_COMPLETED_TX_COUNT = "GRIDGAIN_MAX_COMPLETED_TX_COUNT"; + public static final String GG_MAX_COMPLETED_TX_COUNT = "IGNITE_MAX_COMPLETED_TX_COUNT"; /** * Concurrency level for all concurrent hash maps created by GridGain. */ - public static final String GG_MAP_CONCURRENCY_LEVEL = "GRIDGAIN_MAP_CONCURRENCY_LEVEL"; + public static final String GG_MAP_CONCURRENCY_LEVEL = "IGNITE_MAP_CONCURRENCY_LEVEL"; /** * Transactions that take more time, than value of this property, will be output to log * with warning level. {@code 0} (default value) disables warning on slow transactions. */ - public static final String GG_SLOW_TX_WARN_TIMEOUT = "GRIDGAIN_SLOW_TX_WARN_TIMEOUT"; + public static final String GG_SLOW_TX_WARN_TIMEOUT = "IGNITE_SLOW_TX_WARN_TIMEOUT"; /** * Timeout after which all uncompleted transactions originated by left node will be * salvaged (i.e. invalidated and committed). */ - public static final String GG_TX_SALVAGE_TIMEOUT = "GRIDGAIN_TX_SALVAGE_TIMEOUT"; + public static final String GG_TX_SALVAGE_TIMEOUT = "IGNITE_TX_SALVAGE_TIMEOUT"; /** * System property to override multicast group taken from configuration. * Used for testing purposes. */ - public static final String GG_OVERRIDE_MCAST_GRP = "GRIDGAIN_OVERRIDE_MCAST_GRP"; + public static final String GG_OVERRIDE_MCAST_GRP = "IGNITE_OVERRIDE_MCAST_GRP"; /** * System property to override default reflection cache size. Default value is {@code 128}. */ - public static final String GG_REFLECTION_CACHE_SIZE = "GRIDGAIN_REFLECTION_CACHE_SIZE"; + public static final String GG_REFLECTION_CACHE_SIZE = "IGNITE_REFLECTION_CACHE_SIZE"; /** * System property to override default job processor maps sizes for finished jobs and * cancellation requests. Default value is {@code 10240}. */ - public static final String GG_JOBS_HISTORY_SIZE = "GRIDGAIN_JOBS_HISTORY_SIZE"; + public static final String GG_JOBS_HISTORY_SIZE = "IGNITE_JOBS_HISTORY_SIZE"; /** * System property to override default job metrics processor property defining * concurrency level for structure holding job metrics snapshots. * Default value is {@code 64}. */ - public static final String GG_JOBS_METRICS_CONCURRENCY_LEVEL = "GRIDGAIN_JOBS_METRICS_CONCURRENCY_LEVEL"; + public static final String GG_JOBS_METRICS_CONCURRENCY_LEVEL = "IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL"; /** * System property to hold optional configuration URL. */ - public static final String GG_CONFIG_URL = "GRIDGAIN_CONFIG_URL"; + public static final String GG_CONFIG_URL = "IGNITE_CONFIG_URL"; /** System property to hold SSH host for visor-started nodes. */ - public static final String GG_SSH_HOST = "GRIDGAIN_SSH_HOST"; + public static final String GG_SSH_HOST = "IGNITE_SSH_HOST"; /** System property to hold SSH user name for visor-started nodes. */ - public static final String GG_SSH_USER_NAME = "GRIDGAIN_SSH_USER_NAME"; + public static final String GG_SSH_USER_NAME = "IGNITE_SSH_USER_NAME"; /** System property to hold preload resend timeout for evicted partitions. */ - public static final String GG_PRELOAD_RESEND_TIMEOUT = "GRIDGAIN_PRELOAD_RESEND_TIMEOUT"; + public static final String GG_PRELOAD_RESEND_TIMEOUT = "IGNITE_PRELOAD_RESEND_TIMEOUT"; /** * System property to specify how often in milliseconds marshal buffers * should be rechecked and potentially trimmed. Default value is {@code 10,000ms}. */ - public static final String GG_MARSHAL_BUFFERS_RECHECK = "GRIDGAIN_MARSHAL_BUFFERS_RECHECK"; + public static final String GG_MARSHAL_BUFFERS_RECHECK = "IGNITE_MARSHAL_BUFFERS_RECHECK"; /** * System property to disable {@link HostnameVerifier} for SSL connections. * Can be used for development with self-signed certificates. Default value is {@code false}. */ - public static final String GG_DISABLE_HOSTNAME_VERIFIER = "GRIDGAIN_DISABLE_HOSTNAME_VERIFIER"; + public static final String GG_DISABLE_HOSTNAME_VERIFIER = "IGNITE_DISABLE_HOSTNAME_VERIFIER"; /** * System property to disable buffered communication if node sends less messages count than * specified by this property. Default value is {@code 512}. */ - public static final String GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT = "GRIDGAIN_MIN_BUFFERED_COMMUNICATION_MSG_CNT"; + public static final String GG_MIN_BUFFERED_COMMUNICATION_MSG_CNT = "IGNITE_MIN_BUFFERED_COMMUNICATION_MSG_CNT"; /** * System property to manage ratio for communication buffer resize. Buffer size will either * increase or decrease according to this ratio depending on system behavior. Default value is {@code 0.8}. */ - public static final String GG_COMMUNICATION_BUF_RESIZE_RATIO = "GRIDGAIN_COMMUNICATION_BUF_RESIZE_RATIO"; + public static final String GG_COMMUNICATION_BUF_RESIZE_RATIO = "IGNITE_COMMUNICATION_BUF_RESIZE_RATIO"; /** * Flag that will force GridGain to fill memory block with some recognisable pattern right before * this memory block is released. This will help to recognize cases when already released memory is accessed. */ - public static final String GG_OFFHEAP_SAFE_RELEASE = "GRIDGAIN_OFFHEAP_SAFE_RELEASE"; + public static final String GG_OFFHEAP_SAFE_RELEASE = "IGNITE_OFFHEAP_SAFE_RELEASE"; /** Maximum size for atomic cache queue delete history. */ - public static final String GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE = "GRIDGAIN_ATOMIC_CACHE_DELETE_HISTORY_SIZE"; + public static final String GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE = "IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE"; /** * Comma separated list of addresses in format "10.100.22.100:45000,10.100.22.101:45000". * Makes sense only for {@link org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder}. */ - public static final String GG_TCP_DISCOVERY_ADDRESSES = "GRIDGAIN_TCP_DISCOVERY_ADDRESSES"; + public static final String GG_TCP_DISCOVERY_ADDRESSES = "IGNITE_TCP_DISCOVERY_ADDRESSES"; /** * Flag indicating whether performance suggestions output on start should be disabled. */ - public static final String GG_PERFORMANCE_SUGGESTIONS_DISABLED = "GRIDGAIN_PERFORMANCE_SUGGESTIONS_DISABLED"; + public static final String GG_PERFORMANCE_SUGGESTIONS_DISABLED = "IGNITE_PERFORMANCE_SUGGESTIONS_DISABLED"; /** * Specifies log level for Visor client logging. */ - public static final String GG_VISOR_CLIENT_LOG_LEVEL = "GRIDGAIN_VISOR_CLIENT_LOG_LEVEL"; + public static final String GG_VISOR_CLIENT_LOG_LEVEL = "IGNITE_VISOR_CLIENT_LOG_LEVEL"; /** * Atomic cache deferred update response buffer size. */ - public static final String GG_ATOMIC_DEFERRED_ACK_BUFFER_SIZE = "GRIDGAIN_ATOMIC_DEFERRED_ACK_BUFFER_SIZE"; + public static final String GG_ATOMIC_DEFERRED_ACK_BUFFER_SIZE = "IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE"; /** * Atomic cache deferred update timeout. */ - public static final String GG_ATOMIC_DEFERRED_ACK_TIMEOUT = "GRIDGAIN_ATOMIC_DEFERRED_ACK_TIMEOUT"; + public static final String GG_ATOMIC_DEFERRED_ACK_TIMEOUT = "IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT"; /** * If this property set then debug console will be opened for H2 indexing SPI. */ - public static final String GG_H2_DEBUG_CONSOLE = "GRIDGAIN_H2_DEBUG_CONSOLE"; + public static final String GG_H2_DEBUG_CONSOLE = "IGNITE_H2_DEBUG_CONSOLE"; /** * If this property is set to {@code true} then shared memory space native debug will be enabled. */ - public static final String GG_IPC_SHMEM_SPACE_DEBUG = "GRIDGAIN_IPC_SHMEM_SPACE_DEBUG"; + public static final String GG_IPC_SHMEM_SPACE_DEBUG = "IGNITE_IPC_SHMEM_SPACE_DEBUG"; /** * Portable object array initial capacity. */ - public static final String GG_PORTABLE_ARRAY_INITIAL_CAPACITY = "GRIDGAIN_PORTABLE_ARRAY_INITIAL_CAPACITY"; + public static final String GG_PORTABLE_ARRAY_INITIAL_CAPACITY = "IGNITE_PORTABLE_ARRAY_INITIAL_CAPACITY"; /** * Property allowing to skip configuration consistency checks. */ public static final String GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK = - "GRIDGAIN_SKIP_CONFIGURATION_CONSISTENCY_CHECK"; + "IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK"; /** * Flag indicating whether validation of keys put to cache should be disabled. */ - public static final String GG_CACHE_KEY_VALIDATION_DISABLED = "GRIDGAIN_CACHE_KEY_VALIDATION_DISABLED"; + public static final String GG_CACHE_KEY_VALIDATION_DISABLED = "IGNITE_CACHE_KEY_VALIDATION_DISABLED"; /** * Environment variable to override logging directory that has been set in logger configuration. */ - public static final String GG_LOG_DIR = "GRIDGAIN_LOG_DIR"; + public static final String GG_LOG_DIR = "IGNITE_LOG_DIR"; /** * Environment variable to set work directory. The property {@link org.apache.ignite.configuration.IgniteConfiguration#setWorkDirectory} has higher * priority. */ - public static final String GG_WORK_DIR = "GRIDGAIN_WORK_DIR"; + public static final String GG_WORK_DIR = "IGNITE_WORK_DIR"; /** * If this property is set to {@code true} then GridGain will append @@ -466,7 +466,7 @@ public final class IgniteSystemProperties { * <p> * Default is {@code false}. */ - public static final String GG_MBEAN_APPEND_JVM_ID = "GRIDGAIN_MBEAN_APPEND_JVM_ID"; + public static final String GG_MBEAN_APPEND_JVM_ID = "IGNITE_MBEAN_APPEND_JVM_ID"; /** * Enforces singleton. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java index e0d3648..61af15e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java @@ -1965,7 +1965,7 @@ public class GridGainEx { grid = null; } - // Do NOT set it up only if GRIDGAIN_NO_SHUTDOWN_HOOK=TRUE is provided. + // Do NOT set it up only if IGNITE_NO_SHUTDOWN_HOOK=TRUE is provided. if (!IgniteSystemProperties.getBoolean(GG_NO_SHUTDOWN_HOOK, false)) { try { Runtime.getRuntime().addShutdownHook(shutdownHook = new Thread() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java index c3ae273..0ffa030 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java @@ -1714,7 +1714,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe U.quiet(false, " ^-- Logging to file '" + fileName + '\''); U.quiet(false, - " ^-- To see **FULL** console log here add -DGRIDGAIN_QUIET=false or \"-v\" to ggstart.{sh|bat}", + " ^-- To see **FULL** console log here add -DIGNITE_QUIET=false or \"-v\" to ggstart.{sh|bat}", ""); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java index 5920b1b..aaa8ef8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/jobmetrics/GridJobMetricsProcessor.java @@ -128,7 +128,7 @@ public class GridJobMetricsProcessor extends GridProcessorAdapter { if (metrics.snapshotsQueues == null) throw new IgniteCheckedException("Invalid concurrency level configured " + - "(is 'GRIDGAIN_JOBS_METRICS_CONCURRENCY_LEVEL' system property properly set?)."); + "(is 'IGNITE_JOBS_METRICS_CONCURRENCY_LEVEL' system property properly set?)."); if (log.isDebugEnabled()) log.debug("Job metrics processor started [histSize=" + histSize + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java index 5279b59..f98fc40 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java @@ -285,10 +285,10 @@ public abstract class GridUtils { private static final Collection<Class<?>> PORTABLE_CLS = new HashSet<>(); /** GridGain Logging Directory. */ - public static final String GRIDGAIN_LOG_DIR = System.getenv(GG_LOG_DIR); + public static final String IGNITE_LOG_DIR = System.getenv(GG_LOG_DIR); /** GridGain Work Directory. */ - public static final String GRIDGAIN_WORK_DIR = System.getenv(GG_WORK_DIR); + public static final String IGNITE_WORK_DIR = System.getenv(GG_WORK_DIR); /** Clock timer. */ private static Thread timer; @@ -8487,8 +8487,8 @@ public abstract class GridUtils { if (!F.isEmpty(userWorkDir)) workDir = new File(userWorkDir); - else if (!F.isEmpty(GRIDGAIN_WORK_DIR)) - workDir = new File(GRIDGAIN_WORK_DIR); + else if (!F.isEmpty(IGNITE_WORK_DIR)) + workDir = new File(IGNITE_WORK_DIR); else if (!F.isEmpty(userGgHome)) workDir = new File(userGgHome, "work"); else { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java index f3c529b..570dae6 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java @@ -132,7 +132,7 @@ public final class IgniteJavaLoggerFileHandler extends StreamHandler { * @return Logging directory. */ private static File logDirectory() throws IgniteCheckedException { - return !F.isEmpty(U.GRIDGAIN_LOG_DIR) ? new File(U.GRIDGAIN_LOG_DIR) : U.resolveWorkDirectory("log", false); + return !F.isEmpty(U.IGNITE_LOG_DIR) ? new File(U.IGNITE_LOG_DIR) : U.resolveWorkDirectory("log", false); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java index de22282..a769827 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java @@ -228,7 +228,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { /** {@inheritDoc} */ @Override public void initializeLocalAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException { - // If GRIDGAIN_OVERRIDE_MCAST_GRP system property is set, use its value to override multicast group from + // If IGNITE_OVERRIDE_MCAST_GRP system property is set, use its value to override multicast group from // configuration. Used for testing purposes. String overrideMcastGrp = System.getProperty(GG_OVERRIDE_MCAST_GRP); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/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 1ecaeeb..e9e3726 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 @@ -147,7 +147,7 @@ public class CommandLineTransformer { StringBuilder sb = new StringBuilder(); addArgWithValue(sb, "INTERACTIVE", formatBooleanValue(interactive)); - addArgWithValue(sb, "QUIET", "-DGRIDGAIN_QUIET=" + !verbose); + addArgWithValue(sb, "QUIET", "-DIGNITE_QUIET=" + !verbose); addArgWithValue(sb, "NO_PAUSE", formatBooleanValue(noPause)); parseJvmOptionsAndSpringConfig(args); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java index 4868455..faee085 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java @@ -47,7 +47,7 @@ import static org.apache.ignite.IgniteState.*; */ public final class GridRandomCommandLineLoader { /** Name of the system property defining name of command line program. */ - private static final String GRIDGAIN_PROG_NAME = "GRIDGAIN_PROG_NAME"; + private static final String IGNITE_PROG_NAME = "IGNITE_PROG_NAME"; /** Copyright text. Ant processed. */ private static final String COPYRIGHT = "Copyright (C) 2014 GridGain Systems."; @@ -125,7 +125,7 @@ public final class GridRandomCommandLineLoader { if (errMsg != null) echo("ERROR: " + errMsg); - String runner = System.getProperty(GRIDGAIN_PROG_NAME, "randggstart.{sh|bat}"); + String runner = System.getProperty(IGNITE_PROG_NAME, "randggstart.{sh|bat}"); int space = runner.indexOf(' '); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java b/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java index 0246376..bc3aea8 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/GridVmNodesStarter.java @@ -42,7 +42,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; */ public final class GridVmNodesStarter { /** Name of the system property defining name of command line program. */ - private static final String GRIDGAIN_PROG_NAME = "GRIDGAIN_PROG_NAME"; + private static final String IGNITE_PROG_NAME = "IGNITE_PROG_NAME"; /** */ private static final String GRID_NAME_PREF = "gg-vm-grid-"; @@ -99,7 +99,7 @@ public final class GridVmNodesStarter { if (errMsg != null) echo("ERROR: " + errMsg); - String runner = System.getProperty(GRIDGAIN_PROG_NAME, "randggstart.{sh|bat}"); + String runner = System.getProperty(IGNITE_PROG_NAME, "randggstart.{sh|bat}"); int space = runner.indexOf(' '); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java index 618dfd8..a7dccec 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java @@ -31,7 +31,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest { */ public void testTransformIfNoArguments() throws Exception { assertEquals( - "\"INTERACTIVE=0\" \"QUIET=-DGRIDGAIN_QUIET=true\" \"NO_PAUSE=0\" " + + "\"INTERACTIVE=0\" \"QUIET=-DIGNITE_QUIET=true\" \"NO_PAUSE=0\" " + "\"JVM_XOPTS=\" \"CONFIG=\"", CommandLineTransformer.transform()); } @@ -101,7 +101,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest { */ public void testTransformIfOnlyPathToConfigSpecified() throws Exception { assertEquals( - "\"INTERACTIVE=0\" \"QUIET=-DGRIDGAIN_QUIET=true\" \"NO_PAUSE=0\" " + + "\"INTERACTIVE=0\" \"QUIET=-DIGNITE_QUIET=true\" \"NO_PAUSE=0\" " + "\"JVM_XOPTS=\" \"CONFIG=c:\\qw.xml\"", CommandLineTransformer.transform("c:\\qw.xml")); } @@ -111,7 +111,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest { */ public void testTransformIfAllSupportedArguments() throws Exception { assertEquals( - "\"INTERACTIVE=1\" \"QUIET=-DGRIDGAIN_QUIET=false\" \"NO_PAUSE=1\" " + + "\"INTERACTIVE=1\" \"QUIET=-DIGNITE_QUIET=false\" \"NO_PAUSE=1\" " + "\"JVM_XOPTS=-Xmx1g -Xms1m\" " + "\"CONFIG=\"c:\\path to\\ÑÑÑÑкий каÑалог\"\"", CommandLineTransformer.transform("-i", "-np", "-v", "-J-Xmx1g", "-J-Xms1m",
