Merge branch 'ignite-962' into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/488ba593 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/488ba593 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/488ba593 Branch: refs/heads/ignite-961 Commit: 488ba59366e6271a3926bfa9f7142b684aa7d1ba Parents: f7bb17c e6ba441 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 17 17:21:37 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 17 17:21:37 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContext.java | 6 + .../ignite/internal/GridKernalContextImpl.java | 14 +- .../ignite/internal/IgniteComponentType.java | 8 + .../apache/ignite/internal/IgniteKernal.java | 1 + .../IgniteCacheObjectProcessorImpl.java | 10 + .../json/IgniteJsonNoopProcessor.java | 67 +++ .../processors/json/IgniteJsonProcessor.java | 71 +++ .../processors/query/GridQueryProcessor.java | 235 ++++++++- .../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 | 194 +++++++ 31 files changed, 2249 insertions(+), 1393 deletions(-) ----------------------------------------------------------------------
