Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62be9d1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62be9d1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62be9d1e Branch: refs/heads/ignite-gg-9858 Commit: 62be9d1eb3259b7b2931e5603a31ddedd3581cfc Parents: 42b3294 ea6c9a4 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Mar 13 15:41:27 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Mar 13 15:41:27 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(-) ----------------------------------------------------------------------
