Merge branches 'ignite-45' and 'ignite-45-330' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45-330
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dccea81f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dccea81f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dccea81f Branch: refs/heads/ignite-497-stick Commit: dccea81fcbb30c31d67eaaf8f4bcc55b0c6d7648 Parents: 135fe35 2f468cb Author: anovikov <anovi...@gridgain.com> Authored: Mon Mar 23 13:32:46 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Mon Mar 23 13:32:46 2015 +0700 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 71 +++++++++++----- bin/ignite-schema-import.sh | 28 ++++--- examples/pom.xml | 23 +++++ examples/schema-import/README.txt | 18 +++- examples/schema-import/bin/db-init.sql | 9 ++ examples/schema-import/bin/schema-import.bat | 88 -------------------- .../schema-import/bin/schema-import.properties | 30 +++++++ examples/schema-import/bin/schema-import.sh | 57 ------------- .../store/auto/CacheAutoStoreExample.java | 86 +++++++++++++++++++ .../auto/CacheAutoStoreLoadDataExample.java | 78 +++++++++++++++++ .../datagrid/store/auto/CacheConfig.java | 80 ++++++++++++++++++ .../datagrid/store/auto/DbH2ServerStartup.java | 78 +++++++++++++++++ .../datagrid/store/auto/package-info.java | 22 +++++ .../store/jdbc/CacheJdbcPojoPersonStore.java | 82 ------------------ .../store/jdbc/CacheAbstractJdbcStore.java | 50 ++++++----- .../store/jdbc/dialect/BasicJdbcDialect.java | 6 +- .../cache/store/jdbc/dialect/DB2Dialect.java | 2 +- .../cache/store/jdbc/dialect/JdbcDialect.java | 2 +- .../store/jdbc/dialect/SQLServerDialect.java | 2 +- modules/schema-import/pom.xml | 29 ++----- .../ignite/schema/generator/CodeGenerator.java | 10 +-- .../ignite/schema/generator/XmlGenerator.java | 14 ++-- .../ignite/schema/ui/SchemaImportApp.java | 63 ++++++++++---- .../schema/test/AbstractSchemaImportTest.java | 19 +---- 24 files changed, 590 insertions(+), 357 deletions(-) ----------------------------------------------------------------------
