Merge branches 'ignite-471' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-471
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75cdbb02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75cdbb02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75cdbb02 Branch: refs/heads/ignite-471 Commit: 75cdbb02408635d254c6512794d76a779744f4fe Parents: 54b67ba 0ab0a5a Author: Valentin Kulichenko <[email protected]> Authored: Mon Mar 16 00:49:52 2015 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Mon Mar 16 00:49:52 2015 -0700 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 4 +- examples/config/store/example-database.script | 22 +-- .../config/store/example-jdbc-pojo-store.xml | 142 ------------------- .../store/CacheNodeWithStoreStartup.java | 45 ++++-- .../datagrid/store/CacheStoreExample.java | 19 +++ .../store/jdbc/CacheJdbcPojoPersonStore.java | 11 -- .../examples/datagrid/store/model/Person.java | 2 +- .../datagrid/store/model/PersonKey.java | 97 ------------- .../processors/cache/GridCacheAdapter.java | 6 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../core/src/test/config/store/jdbc/Ignite.xml | 2 +- .../cache/store/jdbc/model/Organization.java | 2 +- .../cache/store/jdbc/model/OrganizationKey.java | 2 +- .../ignite/cache/store/jdbc/model/Person.java | 2 +- .../store/jdbc/model/PersonComplexKey.java | 2 +- .../cache/store/jdbc/model/PersonKey.java | 2 +- .../schema-import/src/main/java/media/style.css | 2 +- .../commands/cache/VisorCacheCommand.scala | 8 +- 19 files changed, 86 insertions(+), 288 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75cdbb02/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
