Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8b7a2c1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8b7a2c1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8b7a2c1a Branch: refs/heads/sprint-1 Commit: 8b7a2c1a9aee65f5daeb3f7faa88d612374bcbd0 Parents: ce926e9 5aba023 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 13 10:55:13 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 13 10:55:13 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheManager.java | 32 +- .../store/jdbc/CacheAbstractJdbcStore.java | 100 ++-- .../cache/store/jdbc/CacheJdbcPojoStore.java | 8 +- .../configuration/IgniteConfiguration.java | 26 ++ .../org/apache/ignite/internal/IgnitionEx.java | 1 + .../GridDeploymentPerVersionStore.java | 4 +- .../cache/CacheVersionedEntryImpl.java | 9 - .../cache/GridCacheDeploymentManager.java | 14 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 12 +- .../dht/preloader/GridDhtPartitionMap.java | 32 +- .../preloader/GridDhtPartitionsFullMessage.java | 47 +- .../dht/preloader/GridDhtPreloader.java | 18 +- .../handlers/cache/GridCacheCommandHandler.java | 11 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 8 +- .../discovery/GridDiscoveryManagerSelfTest.java | 31 ++ .../cache/GridCacheConcurrentMapSelfTest.java | 4 +- .../cache/GridCacheOffHeapSelfTest.java | 46 +- ...IgniteCacheAbstractExecutionContextTest.java | 96 ++++ .../IgniteCacheAtomicExecutionContextTest.java | 49 ++ ...iteCachePartitionedExecutionContextTest.java | 49 ++ ...niteCacheReplicatedExecutionContextTest.java | 49 ++ .../IgniteCacheTxExecutionContextTest.java | 49 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 8 + .../testsuites/IgniteLangSelfTestSuite.java | 1 - .../core/src/test/webapp/META-INF/gg-config.xml | 349 -------------- .../webapp/META-INF/ignite-webapp-config.xml | 349 ++++++++++++++ modules/core/src/test/webapp/WEB-INF/web.xml | 6 +- .../tests/p2p/CacheDeploymentTestValue.java | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 23 +- .../processors/cache/GridCacheSwapSelfTest.java | 40 +- .../near/GridCachePartitionedQuerySelfTest.java | 33 +- .../query/h2/GridH2IndexRebuildTest.java | 10 +- .../ignite/cache/websession/GridWebSession.java | 286 ------------ .../cache/websession/GridWebSessionFilter.java | 466 ------------------- .../websession/GridWebSessionListener.java | 196 -------- .../cache/websession/IgniteWebSession.java | 286 ++++++++++++ .../websession/IgniteWebSessionFilter.java | 466 +++++++++++++++++++ .../websession/IgniteWebSessionListener.java | 196 ++++++++ .../internal/websession/WebSessionSelfTest.java | 8 +- .../websession/WebSessionServerStart.java | 2 +- .../internal/websession/WebSessionTest.java | 2 +- pom.xml | 19 +- 43 files changed, 1896 insertions(+), 1549 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8b7a2c1a/pom.xml ----------------------------------------------------------------------
