Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12c10f5c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12c10f5c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12c10f5c Branch: refs/heads/ignite-843-rc2 Commit: 12c10f5c65d465ca5f3e0234b0cfb0254cdb7e37 Parents: 478657b 283e63c Author: Alexey Kuznetsov <[email protected]> Authored: Fri Dec 11 11:28:22 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Dec 11 11:28:22 2015 +0700 ---------------------------------------------------------------------- assembly/release-schema-import.xml | 6 +- modules/control-center-agent/.gitignore | 2 + modules/control-center-agent/README.txt | 85 + .../assembly/release-control-center-agent.xml | 80 + .../bin/ignite-web-agent.bat | 18 + .../bin/ignite-web-agent.sh | 36 + .../jdbc-drivers/README.txt | 10 + modules/control-center-agent/logs/README.txt | 5 + modules/control-center-agent/pom.xml | 152 + .../apache/ignite/agent/AgentConfiguration.java | 296 ++ .../org/apache/ignite/agent/AgentLauncher.java | 174 + .../ignite/agent/AgentLoggingConfigurator.java | 88 + .../org/apache/ignite/agent/AgentSocket.java | 190 + .../org/apache/ignite/agent/AgentUtils.java | 115 + .../handlers/DatabaseMetadataExtractor.java | 202 + .../ignite/agent/handlers/RestExecutor.java | 187 + .../org/apache/ignite/agent/remote/Remote.java | 37 + .../ignite/agent/remote/RemoteHandler.java | 253 ++ .../ignite/agent/remote/WebSocketSender.java | 39 + .../agent/testdrive/AgentMetadataTestDrive.java | 94 + .../agent/testdrive/AgentSqlTestDrive.java | 513 +++ .../ignite/agent/testdrive/model/Car.java | 155 + .../ignite/agent/testdrive/model/CarKey.java | 97 + .../ignite/agent/testdrive/model/Country.java | 126 + .../agent/testdrive/model/CountryKey.java | 97 + .../agent/testdrive/model/Department.java | 184 + .../agent/testdrive/model/DepartmentKey.java | 97 + .../ignite/agent/testdrive/model/Employee.java | 358 ++ .../agent/testdrive/model/EmployeeKey.java | 97 + .../ignite/agent/testdrive/model/Parking.java | 126 + .../agent/testdrive/model/ParkingKey.java | 97 + .../src/main/resources/logging.properties | 31 + .../control-center-agent/test-drive/README.txt | 4 + .../test-drive/test-drive.sql | 58 + modules/control-center-web/DEVNOTES.txt | 28 + .../control-center-web/licenses/apache-2.0.txt | 202 + modules/control-center-web/pom.xml | 69 + .../control-center-web/src/main/js/.gitignore | 8 + .../src/main/js/agents/agent-manager.js | 310 ++ .../src/main/js/agents/agent-server.js | 94 + modules/control-center-web/src/main/js/app.js | 166 + .../src/main/js/app/data/os.json | 4 + .../directives/callout/callout-cel.directive.js | 31 + .../js/app/directives/callout/callout-cel.jade | 20 + .../app/directives/callout/callout.directive.js | 27 + .../main/js/app/directives/callout/callout.jade | 20 + .../main/js/app/directives/callout/callout.scss | 72 + .../app/directives/loading/loading.directive.js | 27 + .../main/js/app/directives/loading/loading.jade | 18 + .../ui-ace-docker/ui-ace-docker.controller.js | 43 + .../ui-ace-docker/ui-ace-docker.directive.js | 37 + .../directives/ui-ace-docker/ui-ace-docker.jade | 35 + .../ui-ace-java/ui-ace-java.controller.js | 58 + .../ui-ace-java/ui-ace-java.directive.js | 33 + .../app/directives/ui-ace-java/ui-ace-java.jade | 28 + .../ui-ace-pojos/ui-ace-pojos.controller.js | 89 + .../ui-ace-pojos/ui-ace-pojos.directive.js | 37 + .../directives/ui-ace-pojos/ui-ace-pojos.jade | 34 + .../ui-ace-pom/ui-ace-pom.controller.js | 40 + .../ui-ace-pom/ui-ace-pom.directive.js | 32 + .../app/directives/ui-ace-pom/ui-ace-pom.jade | 17 + .../ui-ace-xml/ui-ace-xml.controller.js | 38 + .../ui-ace-xml/ui-ace-xml.directive.js | 33 + .../app/directives/ui-ace-xml/ui-ace-xml.jade | 17 + .../js/app/filters/hasPojo/hasPojo.filter.js | 26 + .../control-center-web/src/main/js/app/index.js | 142 + .../src/main/js/app/modules/Auth/index.js | 81 + .../src/main/js/app/modules/User/index.js | 64 + .../app/modules/configuration/sidebar/main.js | 56 + .../src/main/js/app/modules/navbar/main.js | 47 + .../src/main/js/app/modules/settings/main.js | 61 + .../main/js/app/modules/states/admin/index.js | 31 + .../app/modules/states/configuration/index.js | 61 + .../configuration/summary/summary.controller.js | 133 + .../configuration/summary/summary.resource.js | 41 + .../main/js/app/modules/states/login/index.js | 50 + .../main/js/app/modules/states/logout/index.js | 33 + .../js/app/modules/states/password/index.js | 40 + .../main/js/app/modules/states/profile/index.js | 31 + .../src/main/js/app/modules/states/sql/index.js | 31 + .../src/main/js/app/modules/terms/main.js | 61 + .../main/js/app/services/UiAceOnLoad/service.js | 36 + .../control-center-web/src/main/js/config.js | 426 ++ .../src/main/js/config/default.json | 25 + .../src/main/js/controllers/admin-controller.js | 89 + .../main/js/controllers/caches-controller.js | 628 +++ .../main/js/controllers/clusters-controller.js | 652 +++ .../src/main/js/controllers/common-module.js | 2153 ++++++++++ .../src/main/js/controllers/ext-searchbox.js | 418 ++ .../src/main/js/controllers/igfs-controller.js | 422 ++ .../main/js/controllers/metadata-controller.js | 1285 ++++++ .../src/main/js/controllers/models/caches.json | 1012 +++++ .../main/js/controllers/models/clusters.json | 1823 ++++++++ .../src/main/js/controllers/models/igfs.json | 413 ++ .../main/js/controllers/models/metadata.json | 238 ++ .../src/main/js/controllers/models/summary.json | 142 + .../main/js/controllers/profile-controller.js | 92 + .../src/main/js/controllers/sql-controller.js | 1500 +++++++ .../src/main/js/controllers/worker-xml.js | 3892 ++++++++++++++++++ modules/control-center-web/src/main/js/db.js | 528 +++ .../src/main/js/gulpfile.js/index.js | 31 + .../src/main/js/gulpfile.js/tasks/build.js | 23 + .../src/main/js/gulpfile.js/tasks/bundle.js | 70 + .../src/main/js/gulpfile.js/tasks/clean.js | 24 + .../src/main/js/gulpfile.js/tasks/connect.js | 36 + .../src/main/js/gulpfile.js/tasks/copy.js | 99 + .../main/js/gulpfile.js/tasks/inject-plugins.js | 71 + .../src/main/js/gulpfile.js/tasks/jade.js | 58 + .../src/main/js/gulpfile.js/tasks/production.js | 28 + .../src/main/js/gulpfile.js/tasks/sass.js | 36 + .../src/main/js/helpers/common-utils.js | 119 + .../src/main/js/helpers/configuration-loader.js | 71 + .../src/main/js/helpers/data-structures.js | 101 + .../js/helpers/generator/generator-common.js | 461 +++ .../js/helpers/generator/generator-docker.js | 53 + .../main/js/helpers/generator/generator-java.js | 2176 ++++++++++ .../main/js/helpers/generator/generator-pom.js | 202 + .../helpers/generator/generator-properties.js | 114 + .../js/helpers/generator/generator-readme.js | 65 + .../main/js/helpers/generator/generator-xml.js | 1515 +++++++ .../src/main/js/ignite_modules/README.txt | 6 + .../src/main/js/keys/test.crt | 13 + .../src/main/js/keys/test.key | 18 + .../control-center-web/src/main/js/package.json | 244 ++ .../src/main/js/public/favicon.png | Bin 0 -> 1150 bytes .../src/main/js/public/images/cache.png | Bin 0 -> 97173 bytes .../src/main/js/public/images/cluster.png | Bin 0 -> 190760 bytes .../src/main/js/public/images/docker.png | Bin 0 -> 994 bytes .../src/main/js/public/images/java.png | Bin 0 -> 170 bytes .../src/main/js/public/images/logo.png | Bin 0 -> 6479 bytes .../src/main/js/public/images/metadata.png | Bin 0 -> 283455 bytes .../src/main/js/public/images/query-chart.png | Bin 0 -> 205236 bytes .../main/js/public/images/query-metadata.png | Bin 0 -> 214756 bytes .../src/main/js/public/images/query-table.png | Bin 0 -> 185341 bytes .../src/main/js/public/images/summary.png | Bin 0 -> 203058 bytes .../src/main/js/public/images/xml.png | Bin 0 -> 232 bytes .../public/stylesheets/_bootstrap-custom.scss | 65 + .../stylesheets/_bootstrap-variables.scss | 891 ++++ .../stylesheets/_font-awesome-custom.scss | 31 + .../src/main/js/public/stylesheets/style.scss | 1788 ++++++++ .../src/main/js/routes/admin.js | 120 + .../src/main/js/routes/agent.js | 331 ++ .../src/main/js/routes/caches.js | 164 + .../src/main/js/routes/clusters.js | 149 + .../src/main/js/routes/igfs.js | 140 + .../src/main/js/routes/metadata.js | 181 + .../src/main/js/routes/notebooks.js | 151 + .../src/main/js/routes/presets.js | 68 + .../src/main/js/routes/profile.js | 89 + .../src/main/js/routes/public.js | 231 ++ modules/control-center-web/src/main/js/serve.js | 122 + .../src/main/js/views/base.jade | 6 + .../src/main/js/views/configuration/caches.jade | 55 + .../main/js/views/configuration/clusters.jade | 52 + .../src/main/js/views/configuration/igfs.jade | 51 + .../js/views/configuration/metadata-load.jade | 90 + .../main/js/views/configuration/metadata.jade | 75 + .../main/js/views/configuration/sidebar.jade | 29 + .../js/views/configuration/summary-tabs.jade | 25 + .../main/js/views/configuration/summary.jade | 87 + .../src/main/js/views/includes/controls.jade | 560 +++ .../src/main/js/views/includes/footer.jade | 20 + .../src/main/js/views/includes/header.jade | 41 + .../src/main/js/views/index.jade | 38 + .../src/main/js/views/login.jade | 141 + .../src/main/js/views/reset.jade | 45 + .../src/main/js/views/settings/admin.jade | 50 + .../src/main/js/views/settings/profile.jade | 62 + .../src/main/js/views/sql/cache-metadata.jade | 36 + .../src/main/js/views/sql/chart-settings.jade | 40 + .../src/main/js/views/sql/notebook-new.jade | 31 + .../src/main/js/views/sql/paragraph-rate.jade | 31 + .../src/main/js/views/sql/sql.jade | 187 + .../main/js/views/templates/agent-download.jade | 56 + .../main/js/views/templates/batch-confirm.jade | 32 + .../src/main/js/views/templates/clone.jade | 32 + .../src/main/js/views/templates/confirm.jade | 27 + .../src/main/js/views/templates/dropdown.jade | 5 + .../src/main/js/views/templates/message.jade | 26 + .../src/main/js/views/templates/select.jade | 26 + .../js/views/templates/validation-error.jade | 25 + .../src/test/js/routes/agent.js | 94 + modules/schema-import-db/README.txt | 4 + modules/schema-import-db/pom.xml | 44 + .../apache/ignite/schema/parser/DbColumn.java | 78 + .../ignite/schema/parser/DbMetadataReader.java | 167 + .../apache/ignite/schema/parser/DbTable.java | 84 + .../parser/dialect/DB2MetadataDialect.java | 35 + .../parser/dialect/DatabaseMetadataDialect.java | 77 + .../parser/dialect/JdbcMetadataDialect.java | 199 + .../parser/dialect/MySQLMetadataDialect.java | 64 + .../parser/dialect/OracleMetadataDialect.java | 366 ++ modules/schema-import/pom.xml | 8 +- .../schema/parser/DatabaseMetadataParser.java | 8 +- .../apache/ignite/schema/parser/DbColumn.java | 76 - .../apache/ignite/schema/parser/DbTable.java | 82 - .../parser/dialect/DB2MetadataDialect.java | 33 - .../parser/dialect/DatabaseMetadataDialect.java | 75 - .../parser/dialect/JdbcMetadataDialect.java | 197 - .../parser/dialect/MySQLMetadataDialect.java | 61 - .../parser/dialect/OracleMetadataDialect.java | 364 -- .../ignite/schema/ui/SchemaImportApp.java | 500 +-- parent/pom.xml | 1 + pom.xml | 40 +- 204 files changed, 36150 insertions(+), 1182 deletions(-) ----------------------------------------------------------------------
