Merge branches 'ignite-sql-tests' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b1c0d73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b1c0d73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b1c0d73 Branch: refs/heads/sprint-2 Commit: 0b1c0d73691984677081164fdbfc1e735cae5f99 Parents: 502c5fc ea6c9a4 Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Mar 13 15:28:02 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Mar 13 15:28:02 2015 +0300 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 25 +------- bin/ignite-schema-import.sh | 4 +- .../store/CacheStoreLoadDataExample.java | 18 ++---- .../ignite/internal/util/IgniteUtils.java | 1 - modules/schema-import/pom.xml | 6 -- .../schema-import/src/main/java/media/style.css | 17 ++++++ .../ignite/schema/generator/XmlGenerator.java | 28 +++++---- .../apache/ignite/schema/model/IndexItem.java | 54 +++++++++++++++++ .../ignite/schema/model/PojoDescriptor.java | 9 ++- .../org/apache/ignite/schema/ui/MessageBox.java | 16 ++++- .../ignite/schema/ui/SchemaImportApp.java | 61 ++++++++++++-------- .../schema/test/AbstractSchemaImportTest.java | 19 +++++- 12 files changed, 166 insertions(+), 92 deletions(-) ----------------------------------------------------------------------
