# ignite-188: FIxes after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ac7a8d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ac7a8d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ac7a8d8 Branch: refs/heads/ignite-sql-tests Commit: 2ac7a8d8a352cd93e594decf897db5d931c20e8b Parents: 6463e28 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 6 23:44:51 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 6 23:44:51 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +- .../core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java | 2 +- .../main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +- .../processors/cache/GridCacheAsyncOperationsLimitSelfTest.java | 1 + .../cache/integration/IgniteCacheLoadAllAbstractTest.java | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac7a8d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 33a36ca..4efebf9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1062,7 +1062,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { return; DeploymentMode locDepMode = ctx.config().getDeploymentMode(); - DeploymentMode rmtDepMode = rmt.attribute(GridNodeAttributes.ATTR_DEPLOYMENT_MODE); + DeploymentMode rmtDepMode = rmt.attribute(IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE); for (GridCacheAttributes rmtAttr : rmtAttrs) { for (GridCacheAttributes locAttr : locAttrs) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac7a8d8/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 408e9e0..9c9f973 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. */ @MXBeanDescription("Ignite 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/2ac7a8d8/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 59a2d12..df973b2 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. */ @MXBeanDescription("Ignite 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/2ac7a8d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java index da5bf61..44b08cf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache; +import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ac7a8d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java index c2ffd5f..819a482 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*;
