Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-164v2 cda4bcbab -> 7d86acb5e
# ignite-164 : rename {get/set}GridGainHome -> {get/set}IgniteHome (part 2, for
all)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d86acb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d86acb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d86acb5
Branch: refs/heads/ignite-164v2
Commit: 7d86acb5e9cdfe60f18fb79e64326fbb7900bd8a
Parents: cda4bcb
Author: Artem Shutak <ashu...@gridgain.com>
Authored: Thu Feb 5 13:23:37 2015 +0300
Committer: Artem Shutak <ashu...@gridgain.com>
Committed: Thu Feb 5 13:23:37 2015 +0300
----------------------------------------------------------------------
.../ignite/configuration/IgniteConfiguration.java | 12 ++++++------
.../java/org/apache/ignite/internal/IgniteKernal.java | 10 +++++-----
.../java/org/apache/ignite/internal/IgnitionEx.java | 4 ++--
.../internal/visor/node/VisorBasicConfiguration.java | 2 +-
.../java/org/apache/ignite/mxbean/IgniteMXBean.java | 2 +-
.../java/org/apache/ignite/spi/IgniteSpiAdapter.java | 4 ++--
.../org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +-
.../apache/ignite/internal/GridHomePathSelfTest.java | 4 ++--
.../org/apache/ignite/testframework/GridTestUtils.java | 6 +++---
.../ignite/testframework/junits/GridAbstractTest.java | 2 +-
.../apache/ignite/testframework/junits/IgniteMock.java | 2 +-
.../resource/GridResourceProcessorSelfTest.java | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index ede3b9f..3e9d18a 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -571,7 +571,7 @@ public class IgniteConfiguration {
discoStartupDelay = cfg.getDiscoveryStartupDelay();
execSvc = cfg.getExecutorService();
execSvcShutdown = cfg.getExecutorServiceShutdown();
- ggHome = cfg.getGridGainHome();
+ ggHome = cfg.getIgniteHome();
ggWork = cfg.getWorkDirectory();
gridName = cfg.getGridName();
ggfsCfg = cfg.getGgfsConfiguration();
@@ -1350,7 +1350,7 @@ public class IgniteConfiguration {
* infer it automatically.
* @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME
*/
- public String getGridGainHome() {
+ public String getIgniteHome() {
return ggHome;
}
@@ -1358,22 +1358,22 @@ public class IgniteConfiguration {
* Sets Ignite installation folder.
*
* @param ggHome {@code Ignition} installation folder.
- * @see IgniteConfiguration#getGridGainHome()
+ * @see IgniteConfiguration#getIgniteHome()
* @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME
*/
- public void setGridGainHome(String ggHome) {
+ public void setIgniteHome(String ggHome) {
this.ggHome = ggHome;
}
/**
* Gets Ignite work folder. If not provided, the method will use work
folder under
- * {@code IGNITE_HOME} specified by {@link
IgniteConfiguration#setGridGainHome(String)} or
+ * {@code IGNITE_HOME} specified by {@link
IgniteConfiguration#setIgniteHome(String)} or
* {@code IGNITE_HOME} environment variable or system property.
* <p>
* If {@code IGNITE_HOME} is not provided, then system temp folder is used.
*
* @return Ignite work folder or {@code null} to make the system attempt
to infer it automatically.
- * @see IgniteConfiguration#getGridGainHome()
+ * @see IgniteConfiguration#getIgniteHome()
* @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME
*/
public String getWorkDirectory() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 64f6181..4532b06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -436,10 +436,10 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
}
/** {@inheritDoc} */
- @Override public String getGridGainHome() {
+ @Override public String getIgniteHome() {
assert cfg != null;
- return cfg.getGridGainHome();
+ return cfg.getIgniteHome();
}
/** {@inheritDoc} */
@@ -643,8 +643,8 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
final GridUpdateNotifier verChecker = verChecker0;
// Ack 3-rd party licenses location.
- if (log.isInfoEnabled() && cfg.getGridGainHome() != null)
- log.info("3-rd party licenses can be found at: " +
cfg.getGridGainHome() + File.separatorChar + "libs" +
+ if (log.isInfoEnabled() && cfg.getIgniteHome() != null)
+ log.info("3-rd party licenses can be found at: " +
cfg.getIgniteHome() + File.separatorChar + "libs" +
File.separatorChar + "licenses");
// Check that user attributes are not conflicting
@@ -2398,7 +2398,7 @@ public class IgniteKernal extends ClusterGroupAdapter
implements IgniteEx, Ignit
// Ack IGNITE_HOME and VM arguments.
if (log.isInfoEnabled()) {
- log.info("IGNITE_HOME=" + cfg.getGridGainHome());
+ log.info("IGNITE_HOME=" + cfg.getIgniteHome());
log.info("VM arguments: " + rtBean.getInputArguments());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 420905d..e6fb76b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1351,7 +1351,7 @@ public class IgnitionEx {
IgniteConfiguration myCfg = new IgniteConfiguration();
- String ggHome = cfg.getGridGainHome();
+ String ggHome = cfg.getIgniteHome();
// Set Ignite home.
if (ggHome == null)
@@ -1399,7 +1399,7 @@ public class IgnitionEx {
throw new IgniteCheckedException("Invalid GridGain
installation home folder: " + ggHome);
}
- myCfg.setGridGainHome(ggHome);
+ myCfg.setIgniteHome(ggHome);
// Copy values that don't need extra processing.
myCfg.setLicenseUrl(cfg.getLicenseUrl());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 260dd39..d91f2a1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -111,7 +111,7 @@ public class VisorBasicConfiguration implements
Serializable {
VisorBasicConfiguration cfg = new VisorBasicConfiguration();
cfg.gridName(c.getGridName());
- cfg.ggHome(getProperty(IGNITE_HOME, c.getGridGainHome()));
+ cfg.ggHome(getProperty(IGNITE_HOME, c.getIgniteHome()));
cfg.localHost(getProperty(IGNITE_LOCAL_HOST, c.getLocalHost()));
cfg.nodeId(g.localNode().id());
cfg.marshaller(compactClass(c.getMarshaller()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index 06d68bd..3a7b80f 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -115,7 +115,7 @@ public interface IgniteMXBean {
* @return Ignite installation home.
*/
@IgniteMXBeanDescription("GridGain installation home folder.")
- public String getGridGainHome();
+ public String getIgniteHome();
/**
* Gets a formatted instance of MBean server instance.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index c9cfa72..e42f18c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -111,8 +111,8 @@ public abstract class IgniteSpiAdapter implements
IgniteSpi, IgniteSpiManagement
}
/** {@inheritDoc} */
- @Override public final String getGridGainHome() {
- return ignite.configuration().getGridGainHome();
+ @Override public final String getIgniteHome() {
+ return ignite.configuration().getIgniteHome();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
index 9caaf8a..31bf44c 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
@@ -65,7 +65,7 @@ public interface IgniteSpiManagementMBean {
* @return Ignite installation home folder.
*/
@IgniteMXBeanDescription("Gridgain installation home folder.")
- public String getGridGainHome();
+ public String getIgniteHome();
/**
* Gets ID of the local node.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
index 8645533..5fcc9e1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
@@ -47,7 +47,7 @@ public class GridHomePathSelfTest extends
GridCommonAbstractTest {
// Test home override.
IgniteConfiguration c = getConfiguration(getTestGridName(1));
- c.setGridGainHome("/new/path");
+ c.setIgniteHome("/new/path");
try {
G.start(c);
@@ -64,7 +64,7 @@ public class GridHomePathSelfTest extends
GridCommonAbstractTest {
// Test no override.
IgniteConfiguration c1 = getConfiguration(getTestGridName(1));
- c1.setGridGainHome(System.getProperty(IGNITE_HOME));
+ c1.setIgniteHome(System.getProperty(IGNITE_HOME));
G.start(c1);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 9d3610a..705b6ba 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -643,7 +643,7 @@ public final class GridTestUtils {
* @throws Exception If failed.
*/
@SuppressWarnings({"ProhibitedExceptionThrown"})
- public static String getGridGainHome() throws Exception {
+ public static String getIgniteHome() throws Exception {
String ggHome = System.getProperty("IGNITE_HOME");
if (ggHome == null)
@@ -795,11 +795,11 @@ public final class GridTestUtils {
* If not, then the check is made if path is relative to ${IGNITE_HOME}.
If both checks fail,
* then {@code null} is returned, otherwise file representing path is
returned.
* <p>
- * See {@link #getGridGainHome()} for information on how {@code
IGNITE_HOME} is retrieved.
+ * See {@link #getIgniteHome()} for information on how {@code IGNITE_HOME}
is retrieved.
*
* @param path Path to resolve.
* @return Resolved path, or {@code null} if file cannot be resolved.
- * @see #getGridGainHome()
+ * @see #getIgniteHome()
*/
@Nullable public static File resolveGridGainPath(String path) {
return resolveGridGainPath(null, path);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index e8ba9a4..994390f 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1057,7 +1057,7 @@ public abstract class GridAbstractTest extends TestCase {
cfg.setGridLogger(rsrcs.getLogger());
cfg.setMarshaller(rsrcs.getMarshaller());
cfg.setNodeId(rsrcs.getNodeId());
- cfg.setGridGainHome(rsrcs.getGridgainHome());
+ cfg.setIgniteHome(rsrcs.getGridgainHome());
cfg.setMBeanServer(rsrcs.getMBeanServer());
cfg.setPeerClassLoadingEnabled(true);
cfg.setMetricsLogFrequency(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 83c96ae..499d8c5 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -84,7 +84,7 @@ public class IgniteMock implements Ignite {
cfg.setMarshaller(marshaller);
cfg.setNodeId(nodeId);
cfg.setMBeanServer(jmx);
- cfg.setGridGainHome(home);
+ cfg.setIgniteHome(home);
cfg.setLocalHost(locHost);
return cfg;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d86acb5/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
index 29d7636..227e6e9 100644
---
a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
+++
b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
@@ -339,7 +339,7 @@ public class GridResourceProcessorSelfTest extends
GridCommonAbstractTest {
@Override public void run() {
assert ignite != null;
assert ignite.configuration() != null;
- assert ignite.configuration().getGridGainHome() !=
null;
+ assert ignite.configuration().getIgniteHome() != null;
}
};
