Merge remote-tracking branch 'remotes/origin/master' into ignite-5272-tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20cf56e5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20cf56e5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20cf56e5 Branch: refs/heads/ignite-5272-tx Commit: 20cf56e5d7223a21966a7823d574312be6b09542 Parents: e6fcaa5 7ceb201 Author: sboikov <[email protected]> Authored: Fri Jun 9 12:57:05 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Jun 9 12:57:05 2017 +0300 ---------------------------------------------------------------------- config/ignite-log4j.xml | 6 +- config/ignite-log4j2.xml | 6 +- modules/clients/src/test/resources/log4j.xml | 2 +- .../visor/query/VisorQueryIndexField.java | 32 ++-- modules/core/src/test/config/log4j-test.xml | 6 +- modules/core/src/test/config/log4j2-test.xml | 6 +- .../src/test/config/log4j2-verbose-test.xml | 4 +- .../processors/cache/IgniteCacheGroupsTest.java | 98 ++++++----- .../loadtest/GridSingleExecutionTest.java | 4 +- .../cache/GridCacheAbstractLoadTest.java | 4 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/logger/GridTestLog4jLogger.java | 4 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 4 +- .../log4j/GridLog4jCorrectFileNameTest.java | 2 +- .../ignite/logger/log4j2/Log4J2Logger.java | 2 +- .../impls/matrix/SparseDistributedMatrix.java | 9 - .../matrix/SparseDistributedMatrixTest.java | 9 - .../Config/Log/dotnet-log4j.xml | 2 +- .../src/main/java/log4j.properties | 2 +- .../frontend/controllers/domains-controller.js | 169 ++++++++++--------- .../views/configuration/domains-import.tpl.pug | 4 +- .../apache/ignite/console/agent/AgentUtils.java | 24 +-- .../ignite/console/agent/db/DbColumn.java | 17 +- .../ignite/console/agent/db/DbSchema.java | 60 +++++++ .../apache/ignite/console/agent/db/DbTable.java | 21 ++- .../db/dialect/DatabaseMetadataDialect.java | 27 ++- .../agent/db/dialect/JdbcMetadataDialect.java | 42 ++++- .../agent/db/dialect/OracleMetadataDialect.java | 116 ++++++++++--- .../agent/handlers/DatabaseListener.java | 18 +- .../src/main/resources/log4j.properties | 6 +- 30 files changed, 460 insertions(+), 250 deletions(-) ----------------------------------------------------------------------
