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/6d0ff1b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d0ff1b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d0ff1b1 Branch: refs/heads/ignite-45 Commit: 6d0ff1b1127b1089fbf82a26af09abb06d00b28c Parents: 14d96a5 c1d5326 Author: AKuznetsov <[email protected]> Authored: Mon Mar 23 22:27:13 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Mon Mar 23 22:27:13 2015 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 65 ++++- .../apache/ignite/internal/IgniteKernal.java | 86 ++++++- .../org/apache/ignite/internal/IgnitionEx.java | 31 +-- .../spring/IgniteSpringProcessor.java | 12 + .../ignite/internal/util/IgniteUtils.java | 27 +++ ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../GridProjectionForCachesSelfTest.java | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 4 +- .../cache/GridCacheClearLocallySelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 6 +- .../GridCacheClientModesAbstractSelfTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 9 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 8 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 34 ++- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../org/apache/ignite/IgniteSpringBean.java | 50 +++- .../spring/IgniteSpringProcessorImpl.java | 100 ++++---- .../internal/IgniteDynamicCacheConfigTest.java | 242 +++++++++++++++++++ .../apache/ignite/internal/TestNodeFilter.java | 36 +++ .../java/org/apache/ignite/internal/cache.xml | 58 +++++ .../apache/ignite/internal/filtered-cache.xml | 62 +++++ .../apache/ignite/internal/invalid-cache.xml | 78 ++++++ .../testsuites/IgniteSpringTestSuite.java | 2 + 25 files changed, 819 insertions(+), 111 deletions(-) ----------------------------------------------------------------------
