Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-55-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74ab5e0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74ab5e0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74ab5e0d Branch: refs/heads/ignite-96 Commit: 74ab5e0df1972d741cd35f04e0a631dbc68aadd3 Parents: e8d4d6e da54496 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Feb 11 22:23:13 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Feb 11 22:23:13 2015 +0700 ---------------------------------------------------------------------- modules/clients/src/test/keystore/generate.sh | 25 ++--- .../src/main/java/org/apache/ignite/Ignite.java | 11 +-- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 15 +-- .../ignite/events/AuthorizationEvent.java | 2 +- .../org/apache/ignite/events/CacheEvent.java | 2 +- .../apache/ignite/events/CheckpointEvent.java | 2 +- .../apache/ignite/events/DeploymentEvent.java | 2 +- .../java/org/apache/ignite/events/JobEvent.java | 2 +- .../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/CacheEntryImpl.java | 6 +- .../processors/cache/GridCacheStoreManager.java | 3 +- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../processors/rest/GridRestProcessor.java | 2 +- .../ignite/internal/product/IgniteProduct.java | 8 ++ .../optimized/optimized-classnames.properties | 57 ++++++------ .../ignite/plugin/security/GridSecurity.java | 97 -------------------- .../plugin/security/GridSecuritySubject.java | 1 - modules/core/src/test/config/tests.properties | 6 +- .../junits/GridTestKernalContext.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 6 -- .../hadoop/GridHadoopClassLoader.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 2 +- .../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 -- .../cache/websession/GridWebSessionFilter.java | 2 +- pom.xml | 51 ++++++---- 35 files changed, 155 insertions(+), 385 deletions(-) ----------------------------------------------------------------------
