Merge branch 'ignite-411-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a9ce52a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a9ce52a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a9ce52a Branch: refs/heads/ignite-368 Commit: 2a9ce52aad8a2af7e1a41171f63417df18599c7d Parents: b2f1e43 3ccf656 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Mar 13 17:51:13 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Mar 13 17:51:13 2015 +0700 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 25 +------- bin/ignite-schema-import.sh | 4 +- 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 +++++- 10 files changed, 160 insertions(+), 79 deletions(-) ----------------------------------------------------------------------
