Merge remote-tracking branch 'origin/sprint-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/70e0cc69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/70e0cc69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/70e0cc69

Branch: refs/heads/ignite-406
Commit: 70e0cc69fad892e79969c4d93a55e0d98305a2cf
Parents: 1511004 6abda67
Author: Artem Shutak <ashu...@gridgain.com>
Authored: Thu Mar 12 16:08:14 2015 +0300
Committer: Artem Shutak <ashu...@gridgain.com>
Committed: Thu Mar 12 16:08:14 2015 +0300

----------------------------------------------------------------------
 assembly/dependencies-optional-fabric.xml       |    2 +-
 assembly/dependencies-optional-hadoop.xml       |    2 +-
 assembly/dependencies-schema-import.xml         |   56 +
 assembly/dependencies-schema-load.xml           |   56 -
 assembly/release-hadoop.xml                     |   16 +-
 bin/ignite-schema-import.bat                    |  116 ++
 bin/ignite-schema-import.sh                     |   78 +
 bin/ignite-schema-load.bat                      |  116 --
 bin/ignite-schema-load.sh                       |   78 -
 docs/core-site.ignite.xml                       |   90 -
 docs/hadoop_readme.md                           |  134 --
 docs/hadoop_readme.pdf                          |  Bin 82297 -> 0 bytes
 docs/hive-site.ignite.xml                       |   37 -
 docs/mapred-site.ignite.xml                     |   66 -
 examples/config/store/example-database.script   |   12 +
 .../config/store/example-jdbc-pojo-store.xml    |  142 ++
 .../store/CacheNodeWithStoreStartup.java        |   33 +
 .../datagrid/store/CacheStoreExample.java       |    1 +
 .../store/CacheStoreLoadDataExample.java        |   10 +-
 .../ignite/examples/datagrid/store/Person.java  |  103 --
 .../store/dummy/CacheDummyPersonStore.java      |    2 +-
 .../hibernate/CacheHibernatePersonStore.java    |    2 +-
 .../datagrid/store/hibernate/Person.hbm.xml     |    2 +-
 .../datagrid/store/hibernate/hibernate.cfg.xml  |    3 -
 .../store/jdbc/CacheJdbcPersonStore.java        |    4 +-
 .../store/jdbc/CacheJdbcPojoPersonStore.java    |   96 ++
 .../examples/datagrid/store/model/Person.java   |  155 ++
 .../datagrid/store/model/PersonKey.java         |   97 ++
 .../store/jdbc/CacheAbstractJdbcStore.java      |   33 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   52 +-
 modules/hadoop/config/core-site.ignite.xml      |   90 +
 modules/hadoop/config/hive-site.ignite.xml      |   37 +
 modules/hadoop/config/mapred-site.ignite.xml    |   66 +
 modules/hadoop/docs/hadoop_readme.md            |  135 ++
 modules/hadoop/docs/hadoop_readme.pdf           |  Bin 0 -> 82297 bytes
 .../internal/processors/hadoop/HadoopSetup.java |   33 +-
 .../hadoop/HadoopCommandLineTest.java           |   16 +-
 modules/schema-import/pom.xml                   |  107 ++
 modules/schema-import/readme.txt                |  214 +++
 .../main/java/media/data_connection_48x48.png   |  Bin 0 -> 4443 bytes
 .../src/main/java/media/error_48x48.png         |  Bin 0 -> 4349 bytes
 .../src/main/java/media/ignite_128x128.png      |  Bin 0 -> 4917 bytes
 .../src/main/java/media/ignite_16x16.png        |  Bin 0 -> 608 bytes
 .../src/main/java/media/ignite_24x24.png        |  Bin 0 -> 930 bytes
 .../src/main/java/media/ignite_32x32.png        |  Bin 0 -> 1203 bytes
 .../src/main/java/media/ignite_48x48.png        |  Bin 0 -> 1868 bytes
 .../src/main/java/media/ignite_64x64.png        |  Bin 0 -> 2453 bytes
 .../src/main/java/media/information_48x48.png   |  Bin 0 -> 4102 bytes
 .../src/main/java/media/question_48x48.png      |  Bin 0 -> 3857 bytes
 .../src/main/java/media/sign_warning_48x48.png  |  Bin 0 -> 2988 bytes
 .../schema-import/src/main/java/media/style.css |  117 ++
 .../src/main/java/media/text_tree_48x48.png     |  Bin 0 -> 2567 bytes
 .../ignite/schema/generator/PojoGenerator.java  |  414 +++++
 .../schema/generator/SnippetGenerator.java      |  138 ++
 .../ignite/schema/generator/XmlGenerator.java   |  347 ++++
 .../ignite/schema/model/PojoDescriptor.java     |  510 ++++++
 .../apache/ignite/schema/model/PojoField.java   |  420 +++++
 .../schema/parser/DatabaseMetadataParser.java   |  108 ++
 .../apache/ignite/schema/parser/DbColumn.java   |   76 +
 .../apache/ignite/schema/parser/DbTable.java    |  105 ++
 .../parser/dialect/DB2MetadataDialect.java      |   30 +
 .../parser/dialect/DatabaseMetadataDialect.java |   78 +
 .../parser/dialect/JdbcMetadataDialect.java     |  141 ++
 .../parser/dialect/OracleMetadataDialect.java   |  281 +++
 .../ignite/schema/ui/ConfirmCallable.java       |   81 +
 .../org/apache/ignite/schema/ui/Controls.java   |  661 +++++++
 .../org/apache/ignite/schema/ui/GridPaneEx.java |  177 ++
 .../org/apache/ignite/schema/ui/MessageBox.java |  246 +++
 .../apache/ignite/schema/ui/ModalDialog.java    |   50 +
 .../ignite/schema/ui/SchemaImportApp.java       | 1615 ++++++++++++++++++
 .../ignite/schema/ui/TextColumnValidator.java   |   32 +
 .../schema/test/AbstractSchemaImportTest.java   |  134 ++
 .../test/generator/PojoGeneratorTest.java       |   70 +
 .../schema/test/generator/XmlGeneratorTest.java |   50 +
 .../apache/ignite/schema/test/model/Ignite.xml  |  390 +++++
 .../apache/ignite/schema/test/model/Objects.txt |  502 ++++++
 .../ignite/schema/test/model/ObjectsKey.txt     |   96 ++
 .../ignite/schema/test/model/Primitives.txt     |  506 ++++++
 .../ignite/schema/test/model/PrimitivesKey.txt  |   96 ++
 .../test/parser/DbMetadataParserTest.java       |  118 ++
 .../testsuites/IgniteSchemaImportTestSuite.java |   41 +
 modules/schema-load/pom.xml                     |  107 --
 .../main/java/media/data_connection_48x48.png   |  Bin 4443 -> 0 bytes
 .../src/main/java/media/error_48x48.png         |  Bin 4349 -> 0 bytes
 .../src/main/java/media/ignite_128x128.png      |  Bin 4917 -> 0 bytes
 .../src/main/java/media/ignite_16x16.png        |  Bin 608 -> 0 bytes
 .../src/main/java/media/ignite_24x24.png        |  Bin 930 -> 0 bytes
 .../src/main/java/media/ignite_32x32.png        |  Bin 1203 -> 0 bytes
 .../src/main/java/media/ignite_48x48.png        |  Bin 1868 -> 0 bytes
 .../src/main/java/media/ignite_64x64.png        |  Bin 2453 -> 0 bytes
 .../src/main/java/media/information_48x48.png   |  Bin 4102 -> 0 bytes
 .../src/main/java/media/question_48x48.png      |  Bin 3857 -> 0 bytes
 .../src/main/java/media/sign_warning_48x48.png  |  Bin 2988 -> 0 bytes
 .../schema-load/src/main/java/media/style.css   |  117 --
 .../src/main/java/media/text_tree_48x48.png     |  Bin 2567 -> 0 bytes
 .../ignite/schema/generator/PojoGenerator.java  |  414 -----
 .../schema/generator/SnippetGenerator.java      |  138 --
 .../ignite/schema/generator/XmlGenerator.java   |  347 ----
 .../ignite/schema/model/PojoDescriptor.java     |  510 ------
 .../apache/ignite/schema/model/PojoField.java   |  420 -----
 .../schema/parser/DatabaseMetadataParser.java   |  108 --
 .../apache/ignite/schema/parser/DbColumn.java   |   76 -
 .../apache/ignite/schema/parser/DbTable.java    |  105 --
 .../parser/dialect/DB2MetadataDialect.java      |   30 -
 .../parser/dialect/DatabaseMetadataDialect.java |   78 -
 .../parser/dialect/JdbcMetadataDialect.java     |  141 --
 .../parser/dialect/OracleMetadataDialect.java   |  281 ---
 .../ignite/schema/ui/ConfirmCallable.java       |   81 -
 .../org/apache/ignite/schema/ui/Controls.java   |  661 -------
 .../org/apache/ignite/schema/ui/GridPaneEx.java |  177 --
 .../org/apache/ignite/schema/ui/MessageBox.java |  246 ---
 .../apache/ignite/schema/ui/ModalDialog.java    |   50 -
 .../apache/ignite/schema/ui/SchemaLoadApp.java  | 1615 ------------------
 .../ignite/schema/ui/TextColumnValidator.java   |   32 -
 .../schema/load/AbstractSchemaLoaderTest.java   |  134 --
 .../load/generator/PojoGeneratorTest.java       |   70 -
 .../schema/load/generator/XmlGeneratorTest.java |   50 -
 .../apache/ignite/schema/load/model/Ignite.xml  |  390 -----
 .../apache/ignite/schema/load/model/Objects.txt |  502 ------
 .../ignite/schema/load/model/ObjectsKey.txt     |   96 --
 .../ignite/schema/load/model/Primitives.txt     |  506 ------
 .../ignite/schema/load/model/PrimitivesKey.txt  |   96 --
 .../load/parser/DbMetadataParserTest.java       |  118 --
 .../testsuites/IgniteSchemaLoadTestSuite.java   |   41 -
 .../apache/ignite/visor/plugin/VisorPlugin.java |    8 +-
 pom.xml                                         |    8 +-
 126 files changed, 9187 insertions(+), 8488 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/70e0cc69/pom.xml
----------------------------------------------------------------------

Reply via email to