Repository: incubator-ignite Updated Branches: refs/heads/ignite-386 8e2a08b99 -> 4cdc97de2
# IGNITE-386: Fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4cdc97de Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4cdc97de Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4cdc97de Branch: refs/heads/ignite-386 Commit: 4cdc97de21745ff59ef7287e785656c9ac0d1f4f Parents: 8e2a08b Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Mar 4 15:43:39 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Mar 4 15:43:39 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 2 +- examples/config/filesystem/example-igfs.xml | 2 +- modules/core/src/test/config/igfs-loopback.xml | 2 +- modules/core/src/test/config/igfs-shmem.xml | 2 +- .../ignite/internal/processors/igfs/IgfsModesSelfTest.java | 4 ++-- .../src/main/scala/org/apache/ignite/visor/visor.scala | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cdc97de/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index 0314481..65a281e 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -112,7 +112,7 @@ <!-- Configure one IGFS file system instance named "igfs" on this node. --> - <property name="igfsConfiguration"> + <property name="fileSystemConfiguration"> <list> <bean class="org.apache.ignite.configuration.FileSystemConfiguration" parent="igfsCfgBase"> <property name="name" value="igfs"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cdc97de/examples/config/filesystem/example-igfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-igfs.xml b/examples/config/filesystem/example-igfs.xml index ffab908..d8ccd34 100644 --- a/examples/config/filesystem/example-igfs.xml +++ b/examples/config/filesystem/example-igfs.xml @@ -63,7 +63,7 @@ </bean> </property> - <property name="igfsConfiguration"> + <property name="fileSystemConfiguration"> <list> <bean class="org.apache.ignite.configuration.FileSystemConfiguration"> <property name="name" value="igfs"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cdc97de/modules/core/src/test/config/igfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml index ab4b172..46377d9 100644 --- a/modules/core/src/test/config/igfs-loopback.xml +++ b/modules/core/src/test/config/igfs-loopback.xml @@ -78,7 +78,7 @@ </bean> </property> - <property name="igfsConfiguration"> + <property name="fileSystemConfiguration"> <list> <bean class="org.apache.ignite.configuration.FileSystemConfiguration"> <property name="name" value="igfs"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cdc97de/modules/core/src/test/config/igfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml index bb0b0c1..c08f78d 100644 --- a/modules/core/src/test/config/igfs-shmem.xml +++ b/modules/core/src/test/config/igfs-shmem.xml @@ -78,7 +78,7 @@ </bean> </property> - <property name="igfsConfiguration"> + <property name="fileSystemConfiguration"> <list> <bean class="org.apache.ignite.configuration.FileSystemConfiguration"> <property name="name" value="igfs"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cdc97de/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java index ea136ac..4a58285 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsModesSelfTest.java @@ -378,7 +378,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } assertTrue(errMsg.startsWith( - "Grid configuration parameter invalid: secondaryFileSystem cannot be null when mode is SECONDARY")); + "Grid configuration parameter invalid: secondaryFileSystem cannot be null when mode is not PRIMARY")); } /** @@ -444,7 +444,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest { } assertTrue(errMsg.startsWith( - "Grid configuration parameter invalid: secondaryFileSystem cannot be null when mode is SECONDARY")); + "Grid configuration parameter invalid: secondaryFileSystem cannot be null when mode is not PRIMARY")); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cdc97de/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 964de1d..f0e5eba 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -1520,8 +1520,8 @@ object visor extends VisorTag { val cfgs = try // Cache, IGFS, streamer and DR configurations should be excluded from daemon node config. - spring.loadConfigurations(url, "cacheConfiguration", "igfsConfiguration", "streamerConfiguration", - "drSenderHubConfiguration", "drReceiverHubConfiguration").get1() + spring.loadConfigurations(url, "cacheConfiguration", "fileSystemConfiguration", + "streamerConfiguration", "drSenderHubConfiguration", "drReceiverHubConfiguration").get1() finally { if (log4jTup != null) U.removeLog4jNoOpLogger(log4jTup)
