Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-204
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/278ae1de Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/278ae1de Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/278ae1de Branch: refs/heads/ignite-204 Commit: 278ae1de1829445f923a629affb84688d632cd08 Parents: 1daee0e db8b4c7 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Feb 11 17:35:33 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Feb 11 17:35:33 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 11 +-- .../ignite/internal/GridKernalContext.java | 5 - .../ignite/internal/GridKernalContextImpl.java | 13 +-- .../apache/ignite/internal/GridProductImpl.java | 11 ++- .../apache/ignite/internal/IgniteKernal.java | 61 +----------- .../internal/managers/GridManagerAdapter.java | 14 ++- .../managers/security/GridSecurityImpl.java | 95 ------------------- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/rest/GridRestProcessor.java | 2 +- .../ignite/internal/product/IgniteProduct.java | 8 ++ .../optimized/optimized-classnames.properties | 2 +- .../ignite/plugin/security/GridSecurity.java | 97 -------------------- .../plugin/security/GridSecuritySubject.java | 1 - .../junits/GridTestKernalContext.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 6 -- .../schema-load/src/main/java/media/style.css | 5 + .../org/apache/ignite/schema/ui/MessageBox.java | 8 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 7 -- pom.xml | 11 +++ 20 files changed, 63 insertions(+), 303 deletions(-) ----------------------------------------------------------------------
