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/c0e1b52d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0e1b52d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0e1b52d

Branch: refs/heads/sprint-1-release
Commit: c0e1b52da37a1d8daa819e79feea7535d0a422e6
Parents: 150a3fb 89b5476
Author: anovikov <anovi...@gridgain.com>
Authored: Mon Feb 16 17:29:48 2015 +0700
Committer: anovikov <anovi...@gridgain.com>
Committed: Mon Feb 16 17:29:48 2015 +0700

----------------------------------------------------------------------
 .../store/dummy/CacheDummyPersonStore.java      | 11 +++
 .../hibernate/CacheHibernatePersonStore.java    | 12 +++
 .../store/jdbc/CacheJdbcPersonStore.java        | 11 ++-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |  2 +-
 .../apache/ignite/cache/store/CacheStore.java   | 31 +-------
 .../ignite/cache/store/CacheStoreAdapter.java   |  2 +-
 .../ignite/cache/store/CacheStoreSession.java   |  3 +
 .../store/jdbc/CacheAbstractJdbcStore.java      | 24 +++++-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    | 11 +++
 .../org/apache/ignite/compute/ComputeTask.java  |  3 +-
 .../configuration/CacheConfiguration.java       | 26 +++---
 .../cache/CacheStoreBalancingWrapper.java       |  2 +-
 .../cache/GridCacheLoaderWriterStore.java       |  2 +-
 .../processors/cache/GridCacheMapEntry.java     |  4 +-
 .../processors/cache/GridCacheProcessor.java    |  2 +-
 .../processors/cache/GridCacheStoreManager.java | 84 ++++++++++++--------
 .../cache/GridCacheWriteBehindStore.java        |  2 +-
 .../processors/query/GridQueryProcessor.java    |  6 +-
 .../processors/resource/GridResourceIoc.java    | 48 ++++++++---
 .../resource/GridResourceProcessor.java         | 21 +++++
 .../resources/CacheStoreSessionResource.java    | 41 ++++++++++
 .../apache/ignite/resources/package-info.java   | 22 +++++
 .../org/apache/ignite/resources/package.html    | 25 ------
 .../store/GridCacheBalancingStoreSelfTest.java  |  2 +-
 .../cache/store/GridGeneratingTestStore.java    |  2 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |  2 +-
 ...idCacheConfigurationConsistencySelfTest.java |  2 +-
 .../cache/GridCacheGenericTestStore.java        |  2 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  2 +-
 .../cache/GridCacheStorePutxSelfTest.java       |  2 +-
 .../processors/cache/GridCacheTestStore.java    | 15 +++-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |  2 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        | 14 +++-
 .../IgniteCacheStoreSessionAbstractTest.java    | 20 ++++-
 .../cache/GridAbstractCacheStoreSelfTest.java   |  2 +-
 .../hibernate/CacheHibernateBlobStore.java      | 11 +++
 .../cache/VisorCacheClearCommandSpec.scala      |  4 +-
 .../commands/cache/VisorCacheCommandSpec.scala  |  4 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |  4 +-
 .../cswap/VisorCacheSwapCommandSpec.scala       |  4 +-
 pom.xml                                         | 43 +++++++++-
 41 files changed, 380 insertions(+), 152 deletions(-)
----------------------------------------------------------------------


Reply via email to