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/62afb92f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62afb92f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62afb92f Branch: refs/heads/ignite-45-gridcache Commit: 62afb92fe36d60cae2bff0fa72c302f2ed99f6bc Parents: 25539fd 37c14ba Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Mar 23 13:29:10 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Mar 23 13:29:10 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 4 +- assembly/dependencies-hadoop.xml | 6 +- assembly/dependencies-optional-fabric.xml | 2 +- assembly/dependencies-optional-hadoop.xml | 2 +- assembly/libs/README.txt | 120 +++++++++++ assembly/libs/readme.txt | 120 ----------- bin/ignite-schema-import.sh | 9 +- bin/ignitevisorcmd.sh | 2 +- examples/README.txt | 25 +++ examples/config/filesystem/README.txt | 8 + examples/config/filesystem/readme.txt | 8 - examples/config/hibernate/README.txt | 8 + examples/config/hibernate/readme.txt | 8 - examples/config/servlet/README.txt | 8 + examples/config/servlet/readme.txt | 8 - examples/pom-standalone.xml | 20 +- examples/pom.xml | 2 +- examples/schema-import/README.txt | 11 +- examples/schema-import/bin/db-init.sql | 1 + examples/schema-import/bin/h2-server.sh | 7 +- .../datagrid/store/auto/CacheConfig.java | 18 +- .../hibernate/CacheHibernatePersonStore.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 2 +- ipc/README.txt | 4 + ipc/readme.txt | 4 - ipc/shmem/README.txt | 37 ++++ ipc/shmem/readme.txt | 37 ---- modules/aop/README.txt | 33 +++ modules/aop/readme.txt | 33 --- modules/aws/README.txt | 32 +++ modules/aws/readme.txt | 32 --- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 2 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 4 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../cache/CacheStoreBalancingWrapper.java | 4 +- .../cache/GridCacheLoaderWriterStore.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../transactions/TransactionProxyImpl.java | 17 -- .../apache/ignite/transactions/Transaction.java | 29 --- .../store/GridCacheBalancingStoreSelfTest.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../cache/GridCacheGenericTestStore.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 2 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 6 +- .../IgniteCacheStoreSessionAbstractTest.java | 21 +- ...acheStoreSessionWriteBehindAbstractTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 14 +- .../cache/GridAbstractCacheStoreSelfTest.java | 34 +-- modules/geospatial/README.txt | 33 +++ modules/geospatial/readme.txt | 33 --- modules/hadoop/README.txt | 33 +++ modules/hadoop/readme.txt | 33 --- .../processors/hadoop/HadoopMapReduceTest.java | 24 ++- modules/hibernate/README.txt | 33 +++ modules/hibernate/readme.txt | 33 --- .../hibernate/CacheHibernateBlobStore.java | 6 +- modules/indexing/README.txt | 33 +++ modules/indexing/readme.txt | 33 --- modules/jcl/README.txt | 33 +++ modules/jcl/readme.txt | 33 --- modules/jta/README.txt | 32 +++ modules/jta/readme.txt | 32 --- modules/log4j/README.txt | 32 +++ modules/log4j/readme.txt | 32 --- modules/rest-http/README.txt | 33 +++ modules/rest-http/readme.txt | 33 --- modules/scalar/README.txt | 32 +++ modules/scalar/readme.txt | 32 --- modules/schedule/README.txt | 32 +++ modules/schedule/readme.txt | 32 --- modules/schema-import/README.txt | 214 +++++++++++++++++++ modules/schema-import/readme.txt | 214 ------------------- .../ignite/schema/ui/SchemaImportApp.java | 64 +++--- modules/slf4j/README.txt | 32 +++ modules/slf4j/readme.txt | 32 --- modules/spring/README.txt | 33 +++ modules/spring/readme.txt | 33 --- modules/ssh/README.txt | 32 +++ modules/ssh/readme.txt | 32 --- modules/urideploy/README.txt | 33 +++ modules/urideploy/readme.txt | 33 --- modules/web/README.txt | 34 +++ modules/web/readme.txt | 34 --- pom.xml | 40 ++-- 94 files changed, 1173 insertions(+), 1153 deletions(-) ----------------------------------------------------------------------
