Ignite-67 properties fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4618caa5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4618caa5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4618caa5 Branch: refs/heads/ignite-67 Commit: 4618caa5710e9cceccf3f1d833bf38b630e3c851 Parents: 4e69eb0 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 17:00:10 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 17:00:10 2015 +0300 ---------------------------------------------------------------------- bin/include/service.sh | 6 +++--- .../processors/spring/IgniteSpringProcessorImpl.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4618caa5/bin/include/service.sh ---------------------------------------------------------------------- diff --git a/bin/include/service.sh b/bin/include/service.sh index e024203..1c4031e 100755 --- a/bin/include/service.sh +++ b/bin/include/service.sh @@ -30,7 +30,7 @@ set -e SERVICE=$2 # Name of PID file. -PIDFILE=${GRIDGAIN_PID_DIR}/${SERVICE}.pid +PIDFILE=${IGNITE_PID_DIR}/${SERVICE}.pid case "$1" in start) @@ -56,10 +56,10 @@ case "$1" in fi # Resolve config directory. - GRIDGAIN_CONF_DIR=${GRIDGAIN_CONF_DIR-"${IGNITE_HOME}/config"} + IGNITE_CONF_DIR=${IGNITE_CONF_DIR-"${IGNITE_HOME}/config"} # Resolve full config path. - [[ "$DEFAULT_CONFIG" != /* ]] && DEFAULT_CONFIG="$GRIDGAIN_CONF_DIR/$DEFAULT_CONFIG" + [[ "$DEFAULT_CONFIG" != /* ]] && DEFAULT_CONFIG="$IGNITE_CONF_DIR/$DEFAULT_CONFIG" # Discover path to Java executable and check it's version. checkJava http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4618caa5/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java index 92de544..bd09ef4 100644 --- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java +++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.*; */ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { /** Path to {@code gridgain.xml} file. */ - public static final String GRIDGAIN_XML_PATH = "META-INF/gridgain.xml"; + public static final String IGNITE_XML_PATH = "META-INF/gridgain.xml"; /** System class loader user version. */ private static final AtomicReference<String> SYS_LDR_VER = new AtomicReference<>(null); @@ -151,7 +151,7 @@ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { String usrVer = U.DFLT_USER_VERSION; - InputStream in = ldr.getResourceAsStream(GRIDGAIN_XML_PATH); + InputStream in = ldr.getResourceAsStream(IGNITE_XML_PATH); if (in != null) { // Note: use ByteArrayResource instead of InputStreamResource because @@ -174,19 +174,19 @@ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { catch (NoSuchBeanDefinitionException ignored) { if (log.isInfoEnabled()) log.info("User version is not explicitly defined (will use default version) [file=" + - GRIDGAIN_XML_PATH + ", clsLdr=" + ldr + ']'); + IGNITE_XML_PATH + ", clsLdr=" + ldr + ']'); usrVer = U.DFLT_USER_VERSION; } catch (BeansException e) { U.error(log, "Failed to parse Spring XML file (will use default user version) [file=" + - GRIDGAIN_XML_PATH + ", clsLdr=" + ldr + ']', e); + IGNITE_XML_PATH + ", clsLdr=" + ldr + ']', e); usrVer = U.DFLT_USER_VERSION; } catch (IOException e) { U.error(log, "Failed to read Spring XML file (will use default user version) [file=" + - GRIDGAIN_XML_PATH + ", clsLdr=" + ldr + ']', e); + IGNITE_XML_PATH + ", clsLdr=" + ldr + ']', e); usrVer = U.DFLT_USER_VERSION; }
