Merge branches 'ignite-cleanup-bin' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-cleanup-bin
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e806106 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e806106 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e806106 Branch: refs/heads/sprint-2 Commit: 7e806106fc863f2c54b04ba5afd007e1926d2b08 Parents: 76bb9c3 ea6c9a4 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Mar 13 22:05:46 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Mar 13 22:05:46 2015 +0700 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 25 +------- bin/ignite-schema-import.sh | 4 +- .../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 +++++- 11 files changed, 160 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
