Merge remote-tracking branch 'remotes/origin/ignite-961' into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aef4919a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aef4919a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aef4919a Branch: refs/heads/ignite-1121 Commit: aef4919a97cbc37e4d29695e2e62914726aa4d9c Parents: 8fd577d 72b91c1 Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Mon Jul 20 14:35:42 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Mon Jul 20 14:35:42 2015 +0300 ---------------------------------------------------------------------- examples/config/js/example-query.xml | 91 ++++ examples/pom.xml | 6 + .../ignite/examples/ExampleNodeStartup.java | 2 +- examples/src/main/js/cache-query-example.js | 20 +- .../JettyRestProcessorAbstractSelfTest.java | 506 ++++++++++++++++++- .../ignite/compute/ComputeJobResultPolicy.java | 3 +- .../ignite/internal/GridKernalContext.java | 6 + .../ignite/internal/GridKernalContextImpl.java | 14 +- .../ignite/internal/IgniteComponentType.java | 8 + .../apache/ignite/internal/IgniteKernal.java | 1 + .../failover/GridFailoverContextImpl.java | 28 +- .../managers/failover/GridFailoverManager.java | 13 +- .../processors/cache/GridCacheUtils.java | 4 +- .../IgniteCacheObjectProcessorImpl.java | 10 + .../processors/closure/AffinityTask.java | 35 ++ .../closure/GridClosureProcessor.java | 63 ++- .../json/IgniteJsonNoopProcessor.java | 67 +++ .../processors/json/IgniteJsonProcessor.java | 71 +++ .../processors/query/GridQueryProcessor.java | 235 ++++++++- .../handlers/query/QueryCommandHandler.java | 3 + .../processors/task/GridTaskWorker.java | 24 +- .../ignite/internal/util/IgniteUtils.java | 4 +- .../plugin/security/SecurityPermission.java | 7 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 8 +- .../ignite/spi/failover/FailoverContext.java | 18 + .../spi/failover/always/AlwaysFailoverSpi.java | 25 + .../IgniteClientReconnectFailoverTest.java | 47 +- .../cache/CacheAffinityCallSelfTest.java | 172 +++++++ .../cache/GridCacheAffinityRoutingSelfTest.java | 157 +++++- .../cache/IgniteCacheNearLockValueSelfTest.java | 2 + .../spi/failover/GridFailoverTestContext.java | 10 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../org/apache/ignite/JsonArrayBuilderImpl.java | 130 ----- .../java/org/apache/ignite/JsonArrayImpl.java | 131 ----- .../org/apache/ignite/JsonGeneratorImpl.java | 500 ------------------ .../org/apache/ignite/JsonLocationImpl.java | 60 --- .../java/org/apache/ignite/JsonNumberImpl.java | 116 ----- .../apache/ignite/JsonObjectBuilderImpl.java | 141 ------ .../java/org/apache/ignite/JsonObjectImpl.java | 116 ----- .../org/apache/ignite/JsonProviderImpl.java | 104 ---- .../java/org/apache/ignite/JsonStringImpl.java | 71 --- .../processors/json/IgniteJsonArray.java | 132 +++++ .../processors/json/IgniteJsonArrayBuilder.java | 130 +++++ .../processors/json/IgniteJsonGenerator.java | 500 ++++++++++++++++++ .../processors/json/IgniteJsonLocation.java | 60 +++ .../json/IgniteJsonMessageFactory.java | 36 ++ .../processors/json/IgniteJsonNumber.java | 116 +++++ .../processors/json/IgniteJsonObject.java | 117 +++++ .../json/IgniteJsonObjectBuilder.java | 141 ++++++ .../json/IgniteJsonProcessorImpl.java | 115 +++++ .../processors/json/IgniteJsonProvider.java | 104 ++++ .../processors/json/IgniteJsonString.java | 77 +++ .../processors/json/JsonCacheObject.java | 103 ++++ .../java/org/apache/ignite/json/IgniteJson.java | 36 ++ .../processors/json/IgniteJsonCacheTest.java | 196 +++++++ .../http/jetty/GridJettyRestHandler.java | 46 +- .../ignite/schema/ui/SchemaImportApp.java | 36 +- 57 files changed, 3496 insertions(+), 1479 deletions(-) ----------------------------------------------------------------------
