You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/09/28 02:26:58 UTC
[18/18] ignite git commit: Merge branch ignite-1.7.2 into master.
Merge branch ignite-1.7.2 into master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ffb5860
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ffb5860
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ffb5860
Branch: refs/heads/master
Commit: 4ffb5860baedcd0dfe1a4c74b214246116327afa
Parents: f77f93c a53c399
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 28 09:27:40 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 28 09:27:40 2016 +0700
----------------------------------------------------------------------
.../s3/S3CheckpointManagerSelfTest.java | 3 +
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 4 +
.../s3/S3CheckpointSpiStartStopSelfTest.java | 7 +
.../s3/S3SessionCheckpointSelfTest.java | 2 +
.../s3/TcpDiscoveryS3IpFinderSelfTest.java | 7 +
.../ignite/testsuites/IgniteS3TestSuite.java | 15 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 4 +-
.../ignite/cache/store/jdbc/JdbcType.java | 2 +-
.../apache/ignite/compute/ComputeTaskSpis.java | 8 +-
.../local/LocalIgfsSecondaryFileSystem.java | 19 +-
.../ignite/internal/GridTaskSessionImpl.java | 15 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 22 ++
.../discovery/GridDiscoveryManager.java | 73 +++----
.../loadbalancer/GridLoadBalancerManager.java | 10 +-
.../processors/job/GridJobProcessor.java | 3 +-
.../session/GridTaskSessionProcessor.java | 9 +-
.../processors/task/GridTaskProcessor.java | 3 +-
.../processors/task/GridTaskWorker.java | 2 +-
.../util/GridBoundedConcurrentOrderedMap.java | 5 +
.../TcpDiscoveryMulticastIpFinder.java | 3 -
.../CacheJdbcPojoStoreAbstractSelfTest.java | 55 +++--
...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 12 +-
.../IgniteClientReconnectCacheTest.java | 35 ++++
.../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 6 +-
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 6 +-
.../GridInternalTasksLoadBalancingSelfTest.java | 201 +++++++++++++++++++
.../ignite/testframework/IgniteTestSuite.java | 163 +++++++++++----
.../testframework/junits/GridAbstractTest.java | 22 +-
.../apache/ignite/testsuites/IgniteIgnore.java | 11 +-
.../testsuites/IgniteIgnoredTestSuite.java | 63 ------
.../IgniteSpiLoadBalancingSelfTestSuite.java | 34 ++--
modules/ignored-tests/README.txt | 4 +
modules/ignored-tests/pom.xml | 107 ++++++++++
.../testsuites/IgniteIgnoredTestSuite.java | 45 +++++
.../apache/ignite/testsuites/package-info.java | 22 ++
.../Events/LocalListener.cs | 2 +-
modules/web-console/DEVNOTES.txt | 25 +--
modules/web-console/backend/.babelrc | 9 -
modules/web-console/backend/.eslintrc | 4 +-
modules/web-console/backend/.gitignore | 2 -
modules/web-console/backend/app/agent.js | 66 ++++--
modules/web-console/backend/app/app.js | 2 +
modules/web-console/backend/app/browser.js | 41 +++-
modules/web-console/backend/app/index.js | 116 -----------
modules/web-console/backend/app/mongo.js | 7 +-
modules/web-console/backend/app/mongoose.js | 29 +++
modules/web-console/backend/app/settings.js | 10 +-
.../backend/errors/AuthFailedException.js | 2 +-
.../backend/errors/DuplicateKeyException.js | 2 +-
.../backend/errors/IllegalAccessError.js | 4 +-
.../backend/errors/IllegalArgumentException.js | 2 +-
.../backend/errors/MissingResourceException.js | 2 +-
modules/web-console/backend/errors/index.js | 14 +-
modules/web-console/backend/index.js | 89 +++++++-
modules/web-console/backend/injector.js | 2 +-
modules/web-console/backend/package.json | 23 +--
modules/web-console/backend/routes/demo.js | 8 +-
modules/web-console/backend/routes/public.js | 69 ++-----
modules/web-console/backend/services/auth.js | 79 +++++++-
modules/web-console/backend/services/domains.js | 2 +
modules/web-console/backend/services/mails.js | 16 +-
.../web-console/backend/services/sessions.js | 4 +-
modules/web-console/backend/test/app/db.js | 66 ++++++
.../web-console/backend/test/app/httpAgent.js | 50 +++++
.../web-console/backend/test/app/mockgoose.js | 30 +++
.../web-console/backend/test/data/accounts.json | 5 +-
.../web-console/backend/test/data/caches.json | 30 ++-
.../web-console/backend/test/data/clusters.json | 10 +-
.../web-console/backend/test/data/domains.json | 10 +
.../web-console/backend/test/data/igfss.json | 4 +-
.../web-console/backend/test/data/spaces.json | 14 ++
modules/web-console/backend/test/index.js | 35 ++++
modules/web-console/backend/test/injector.js | 43 ++--
.../web-console/backend/test/routes/clusters.js | 83 ++++++++
.../web-console/backend/test/routes/public.js | 68 +++++++
.../backend/test/unit/AuthService.test.js | 107 ++++++++++
.../backend/test/unit/CacheService.test.js | 20 +-
.../backend/test/unit/ClusterService.test.js | 19 +-
.../backend/test/unit/DomainService.test.js | 19 +-
.../backend/test/unit/IgfsService.test.js | 19 +-
modules/web-console/frontend/app/app.config.js | 2 +-
modules/web-console/frontend/app/app.js | 27 +--
.../frontend/app/data/jdbc-types.json | 44 ++++
.../frontend/app/data/sql-keywords.json | 41 ++++
.../frontend/app/decorator/tooltip.js | 38 ++--
.../directives/retain-selection.directive.js | 67 +++++++
.../ui-ace-pom/ui-ace-pom.controller.js | 4 +-
.../frontend/app/helpers/jade/form.jade | 1 +
.../helpers/jade/form/form-field-datalist.jade | 8 +-
.../helpers/jade/form/form-field-dropdown.jade | 8 +-
.../app/helpers/jade/form/form-field-label.jade | 4 +-
.../helpers/jade/form/form-field-number.jade | 8 +-
.../helpers/jade/form/form-field-password.jade | 47 +++++
.../app/helpers/jade/form/form-field-text.jade | 10 +-
.../frontend/app/helpers/jade/mixins.jade | 101 ++++------
.../modules/configuration/Version.service.js | 25 +++
.../configuration/configuration.module.js | 2 +
.../configuration/generator/Pom.service.js | 30 +--
.../form/validator/java-identifier.directive.js | 4 +-
.../form/validator/java-keywords.directive.js | 6 +-
.../validator/java-package-name.directive.js | 4 +-
.../java-package-specified.directive.js | 7 +-
.../modules/form/validator/uuid.directive.js | 12 +-
.../frontend/app/modules/sql/Notebook.data.js | 16 +-
.../states/configuration/caches/memory.jade | 5 +-
.../states/configuration/caches/query.jade | 12 +-
.../configuration/clusters/cache-key-cfg.jade | 2 +-
.../configuration/clusters/communication.jade | 2 +-
.../states/configuration/clusters/odbc.jade | 47 +++++
.../states/configuration/domains/general.jade | 4 +-
.../states/configuration/domains/query.jade | 16 +-
.../configuration/summary/summary.controller.js | 24 ++-
.../app/modules/version/Version.provider.js | 32 ---
.../app/services/ErrorPopover.service.js | 3 +
.../frontend/app/services/JavaTypes.service.js | 163 ++++++++-------
.../app/services/LegacyUtils.service.js | 44 ----
.../frontend/app/services/SqlTypes.service.js | 67 +++++++
.../frontend/controllers/admin-controller.js | 7 +-
.../frontend/controllers/domains-controller.js | 86 ++++----
.../frontend/controllers/profile-controller.js | 5 +-
.../frontend/generator/generator-common.js | 19 +-
.../frontend/generator/generator-java.js | 89 +++++++-
.../frontend/generator/generator-properties.js | 2 +-
.../frontend/generator/generator-xml.js | 17 +-
.../frontend/public/stylesheets/form-field.scss | 108 ++++++++++
.../frontend/public/stylesheets/style.scss | 1 +
.../frontend/test/unit/JavaTypes.test.js | 82 ++++++--
.../frontend/test/unit/SqlTypes.test.js | 68 +++++++
.../frontend/views/configuration/clusters.jade | 1 +
.../views/configuration/domains-import.jade | 116 +++--------
.../IgniteWebSessionSelfTestSuite.java | 68 +------
.../WebSessionReplicatedSelfTest.java | 28 +++
.../WebSessionReplicatedV1SelfTest.java | 28 +++
.../internal/websession/WebSessionSelfTest.java | 2 +
.../WebSessionTransactionalSelfTest.java | 48 +++++
.../WebSessionTransactionalV1SelfTest.java | 28 +++
.../websession/WebSessionV1SelfTest.java | 28 +++
pom.xml | 7 +
142 files changed, 2945 insertions(+), 1105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ffb5860/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ffb5860/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Events/LocalListener.cs
----------------------------------------------------------------------