Merge branches 'ignite-1155_1' and 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d71b5cf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d71b5cf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d71b5cf1 Branch: refs/heads/ignite-843 Commit: d71b5cf1d3527e8f942d99980b3cb99cfad68b48 Parents: 1865910 fae0422 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Aug 5 08:06:04 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Aug 5 08:06:04 2015 +0700 ---------------------------------------------------------------------- .../ignite/examples/ExampleNodeStartup.java | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 14 + modules/control-center-agent/README.txt | 28 +- modules/control-center-agent/pom.xml | 8 +- .../java/org/apache/ignite/agent/Agent.java | 141 ---------- .../apache/ignite/agent/AgentCommandLine.java | 113 -------- .../apache/ignite/agent/AgentConfiguration.java | 87 ++++-- .../org/apache/ignite/agent/AgentLauncher.java | 37 ++- .../ignite/agent/AgentLoggingConfigurator.java | 83 ++++++ .../org/apache/ignite/agent/AgentSocket.java | 122 ++++---- .../org/apache/ignite/agent/AgentUtils.java | 56 ++++ .../handlers/DatabaseMetadataExtractor.java | 93 ++++++ .../ignite/agent/handlers/RestExecutor.java | 166 +++++++++++ .../ignite/agent/messages/AbstractMessage.java | 25 -- .../ignite/agent/messages/AuthMessage.java | 73 ----- .../ignite/agent/messages/AuthResult.java | 57 ---- .../ignite/agent/messages/MessageFactory.java | 76 ----- .../ignite/agent/messages/RestRequest.java | 127 --------- .../ignite/agent/messages/RestResult.java | 91 ------ .../org/apache/ignite/agent/remote/Remote.java | 34 +++ .../ignite/agent/remote/RemoteHandler.java | 243 ++++++++++++++++ .../ignite/agent/remote/WebSocketSender.java | 39 +++ .../main/resources/default.config.properties | 3 + .../src/main/js/agents/agent-manager.js | 184 +++++++----- .../src/main/js/agents/agent-server.js | 8 +- .../cache/query/GridCacheQueryManager.java | 37 ++- .../cache/query/GridCacheSqlIndexMetadata.java | 11 +- .../cache/query/GridCacheSqlMetadata.java | 28 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 10 +- .../processors/rest/GridRestCommand.java | 3 + .../processors/rest/GridRestProcessor.java | 5 +- .../handlers/cache/GridCacheCommandHandler.java | 14 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 14 +- modules/nodejs/src/main/js/cache.js | 9 + .../http/jetty/GridJettyRestHandler.java | 1 + modules/schema-import-db/README.txt | 4 + modules/schema-import-db/pom.xml | 37 +++ .../apache/ignite/schema/parser/DbColumn.java | 76 +++++ .../ignite/schema/parser/DbMetadataReader.java | 127 +++++++++ .../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 +++++++++++++++++++ modules/schema-import/pom.xml | 6 + .../schema/parser/DatabaseMetadataParser.java | 21 +- .../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/SchemaImportApp.java | 55 +--- pom.xml | 10 + 54 files changed, 2037 insertions(+), 1689 deletions(-) ----------------------------------------------------------------------
