Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ae37892 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ae37892 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ae37892 Branch: refs/heads/ignite-471 Commit: 9ae378922cf7e071571aa360c70e85fc02f618ad Parents: 8e0ce1b e4194aa Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Mar 24 16:00:02 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Mar 24 16:00:02 2015 +0300 ---------------------------------------------------------------------- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../org/apache/ignite/IgniteDataStreamer.java | 24 ++-- .../ignite/cache/affinity/CacheAffinity.java | 14 +- .../cache/query/annotations/package-info.java | 22 ++++ .../org/apache/ignite/cluster/package-info.java | 22 ++++ .../ignite/configuration/package-info.java | 22 ++++ .../processors/cache/GridCacheStoreManager.java | 8 +- .../ignite/internal/processors/igfs/IgfsEx.java | 3 + .../visor/node/VisorIgfsConfiguration.java | 11 ++ .../apache/ignite/lifecycle/package-info.java | 22 ++++ .../org/apache/ignite/plugin/package-info.java | 22 ++++ .../ignite/transactions/package-info.java | 22 ++++ .../spring-cache-client-benchmark-1.xml | 4 +- .../spring-cache-client-benchmark-2.xml | 4 +- .../spring-cache-client-benchmark-3.xml | 4 +- .../core/src/test/config/discovery-stress.xml | 1 - .../src/test/config/load/cache-benchmark.xml | 2 - .../config/load/dsi-49-server-production.xml | 1 - .../src/test/config/load/dsi-load-server.xml | 4 +- ...cheNearUpdateTopologyChangeAbstractTest.java | 129 +++++++++++++++++++ ...CacheAtomicNearUpdateTopologyChangeTest.java | 39 ++++++ .../CacheTxNearUpdateTopologyChangeTest.java | 33 +++++ ...GridCacheDhtEvictionNearReadersSelfTest.java | 8 -- .../dht/GridCacheDhtEvictionSelfTest.java | 8 -- .../dht/GridCacheDhtInternalEntrySelfTest.java | 8 -- .../capacity/spring-capacity-cache.xml | 2 - .../loadtests/colocation/spring-colocation.xml | 2 - .../testframework/junits/GridAbstractTest.java | 8 ++ .../junits/common/GridCommonAbstractTest.java | 53 ++++++++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 26 +++- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 4 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 4 +- .../internal/processors/hadoop/HadoopSetup.java | 8 +- .../hadoop/SecondaryFileSystemProvider.java | 31 +++-- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../ignite/schema/generator/CodeGenerator.java | 111 ++++++++++++++-- .../ignite/schema/generator/XmlGenerator.java | 12 +- .../apache/ignite/schema/model/IndexItem.java | 16 +-- .../ignite/schema/model/PojoDescriptor.java | 16 ++- .../ignite/schema/ui/ConfirmCallable.java | 2 +- .../org/apache/ignite/schema/ui/MessageBox.java | 21 +-- 42 files changed, 637 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
