Merge remote-tracking branch 'remotes/origin/master' into ignite-4929
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d0297e9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d0297e9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d0297e9 Branch: refs/heads/ignite-4929 Commit: 0d0297e9fbba512a3928681f72f65d95fb27ca87 Parents: b69f43e 5c48260 Author: sboikov <[email protected]> Authored: Mon Apr 10 17:06:39 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Apr 10 17:06:39 2017 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 3 - assembly/dependencies-fabric-lgpl.xml | 3 - assembly/dependencies-fabric.xml | 3 - assembly/dependencies-schema-import.xml | 57 - assembly/release-base.xml | 2 - assembly/release-fabric-base.xml | 9 - assembly/release-schema-import.xml | 50 - bin/ignite-schema-import.bat | 110 - bin/ignite-schema-import.sh | 87 - examples/README-LGPL.txt | 4 +- examples/README.txt | 2 - examples/pom-standalone-lgpl.xml | 1 - examples/pom-standalone.xml | 1 - examples/pom.xml | 1 - examples/schema-import/README.txt | 38 - examples/schema-import/bin/db-init.sql | 28 - examples/schema-import/bin/h2-server.bat | 80 - examples/schema-import/bin/h2-server.sh | 66 - .../schema-import/bin/schema-import.properties | 28 - examples/schema-import/pom-standalone.xml | 90 - examples/schema-import/pom.xml | 101 - .../org/apache/ignite/schema/CacheConfig.java | 36 - .../java/org/apache/ignite/schema/Demo.java | 134 -- .../java/org/apache/ignite/schema/DemoNode.java | 38 - .../ignite/schema/H2DataSourceFactory.java | 35 - .../java/org/apache/ignite/schema/Person.java | 44 - .../org/apache/ignite/schema/PersonKey.java | 37 - .../JettyRestProcessorAbstractSelfTest.java | 2 +- .../configuration/IgniteConfiguration.java | 4 +- .../configuration/NearCacheConfiguration.java | 56 +- .../ignite/internal/IgniteEventsImpl.java | 8 +- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../binary/builder/BinaryObjectBuilderImpl.java | 36 +- .../eventstorage/GridEventStorageManager.java | 12 +- .../utils/PlatformConfigurationUtils.java | 29 +- .../org/apache/ignite/internal/util/F0.java | 196 +- .../ignite/internal/util/lang/GridFunc.java | 620 +---- .../deployment/local/LocalDeploymentSpi.java | 5 +- .../spi/eventstorage/NoopEventStorageSpi.java | 53 + .../test/config/store/jdbc/ignite-jdbc-type.xml | 2 +- .../cache/store/jdbc/model/Organization.java | 2 - .../cache/store/jdbc/model/OrganizationKey.java | 2 - .../ignite/cache/store/jdbc/model/Person.java | 2 - .../store/jdbc/model/PersonComplexKey.java | 4 +- .../cache/store/jdbc/model/PersonKey.java | 2 - .../GridEventStorageDefaultExceptionTest.java | 94 + .../testframework/junits/GridAbstractTest.java | 56 +- .../testsuites/IgniteComputeGridTestSuite.java | 2 + .../Apache.Ignite.Core.Tests/EventsTest.cs | 66 +- .../IgniteConfigurationSerializerTest.cs | 13 +- .../IgniteConfigurationTest.cs | 15 +- .../Apache.Ignite.Core.csproj | 3 + .../Events/IEventStorageSpi.cs | 33 + .../Events/MemoryEventStorageSpi.cs | 100 + .../Events/NoopEventStorageSpi.cs | 27 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 48 +- .../IgniteConfigurationSection.xsd | 22 + .../Plugin/IPluginConfiguration.cs | 4 +- modules/schema-import-db/README.txt | 4 - modules/schema-import-db/pom.xml | 55 - .../apache/ignite/schema/parser/DbColumn.java | 88 - .../ignite/schema/parser/DbMetadataReader.java | 147 -- .../apache/ignite/schema/parser/DbTable.java | 82 - .../parser/dialect/DB2MetadataDialect.java | 33 - .../parser/dialect/DatabaseMetadataDialect.java | 102 - .../parser/dialect/JdbcMetadataDialect.java | 199 -- .../parser/dialect/MySQLMetadataDialect.java | 82 - .../parser/dialect/OracleMetadataDialect.java | 360 --- modules/schema-import/README.txt | 216 -- modules/schema-import/pom.xml | 119 - .../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-import/src/main/java/media/style.css | 134 -- .../src/main/java/media/text_tree_48x48.png | Bin 2567 -> 0 bytes .../ignite/schema/generator/CodeGenerator.java | 831 ------- .../ignite/schema/generator/GeneratorUtils.java | 70 - .../ignite/schema/generator/XmlGenerator.java | 446 ---- .../ignite/schema/model/PojoDescriptor.java | 497 ---- .../apache/ignite/schema/model/PojoField.java | 461 ---- .../ignite/schema/model/SchemaDescriptor.java | 62 - .../schema/parser/DatabaseMetadataParser.java | 115 - .../ignite/schema/ui/ConfirmCallable.java | 83 - .../org/apache/ignite/schema/ui/Controls.java | 697 ------ .../org/apache/ignite/schema/ui/GridPaneEx.java | 180 -- .../org/apache/ignite/schema/ui/MessageBox.java | 274 --- .../apache/ignite/schema/ui/ModalDialog.java | 50 - .../ignite/schema/ui/SchemaImportApp.java | 2115 ------------------ .../ignite/schema/ui/TextColumnValidator.java | 32 - .../schema/test/AbstractSchemaImportTest.java | 181 -- .../test/generator/CodeGeneratorTest.java | 81 - .../schema/test/generator/XmlGeneratorTest.java | 42 - .../ignite/schema/test/model/CacheConfig.txt | 409 ---- .../apache/ignite/schema/test/model/Objects.txt | 531 ----- .../ignite/schema/test/model/ObjectsKey.txt | 96 - .../ignite/schema/test/model/Primitives.txt | 535 ----- .../ignite/schema/test/model/PrimitivesKey.txt | 96 - .../org/apache/ignite/schema/test/model/Tst.txt | 535 ----- .../apache/ignite/schema/test/model/TstKey.txt | 96 - .../schema/test/model/ignite-type-metadata.xml | 666 ------ .../test/parser/DbMetadataParserTest.java | 134 -- .../testsuites/IgniteSchemaImportTestSuite.java | 42 - .../ignite/internal/GridFactorySelfTest.java | 3 + modules/web-console/web-agent/pom.xml | 12 - .../ignite/console/agent/db/DbColumn.java | 88 + .../console/agent/db/DbMetadataReader.java | 142 ++ .../apache/ignite/console/agent/db/DbTable.java | 82 + .../agent/db/dialect/DB2MetadataDialect.java | 33 + .../db/dialect/DatabaseMetadataDialect.java | 102 + .../agent/db/dialect/JdbcMetadataDialect.java | 199 ++ .../agent/db/dialect/MySQLMetadataDialect.java | 82 + .../agent/db/dialect/OracleMetadataDialect.java | 359 +++ .../agent/handlers/DatabaseListener.java | 20 +- .../dml/IgniteSqlDeleteFilteredBenchmark.java | 5 +- .../dml/IgniteSqlUpdateFilteredBenchmark.java | 5 +- pom.xml | 121 - 124 files changed, 1706 insertions(+), 13135 deletions(-) ----------------------------------------------------------------------
