ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [5/5] incubator-ignite git commit: Merge branch 'ignite-45-330' into ignite-45
Date Fri, 20 Mar 2015 19:25:15 GMT
Merge branch 'ignite-45-330' into ignite-45

Conflicts:
	examples/schema-import/demo.sql


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbfaf0a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbfaf0a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbfaf0a7

Branch: refs/heads/ignite-45
Commit: dbfaf0a7d305216ce2d02d7da34e52c153c065c8
Parents: 9894f5f c493225
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Sat Mar 21 02:21:56 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Sat Mar 21 02:21:56 2015 +0700

----------------------------------------------------------------------
 assembly/release-fabric.xml                     |   1 +
 bin/ignite-schema-import.bat                    |   2 +-
 bin/ignite-schema-import.sh                     |   4 +-
 examples/schema-import/db-demo-script.bat       |  99 ----
 examples/schema-import/db-demo-server.bat       |  97 ----
 examples/schema-import/db-demo-wizard.bat       |  89 ---
 examples/schema-import/db-demo.bat              |  93 ---
 examples/schema-import/demo.sql                 |  27 -
 examples/schema-import/h2-server.bat            |  80 +++
 examples/schema-import/h2-server.sh             |  63 ++
 examples/schema-import/schema-import.bat        |  88 +++
 examples/schema-import/schema-import.sh         |  57 ++
 .../ignite/schema/generator/CodeGenerator.java  | 581 +++++++++++++++++++
 .../ignite/schema/generator/PojoGenerator.java  | 414 -------------
 .../schema/generator/SnippetGenerator.java      | 144 -----
 .../ignite/schema/ui/SchemaImportApp.java       |   4 +-
 .../test/generator/CodeGeneratorTest.java       |  70 +++
 .../test/generator/PojoGeneratorTest.java       |  70 ---
 .../testsuites/IgniteSchemaImportTestSuite.java |   2 +-
 19 files changed, 946 insertions(+), 1039 deletions(-)
----------------------------------------------------------------------



Mime
View raw message