Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-312
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71896e2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71896e2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71896e2a Branch: refs/heads/ignite-312 Commit: 71896e2a7ecc7dd7213ed52606bead6ef5d6d3a3 Parents: a93ebc8 e86c69e Author: sevdokimov <[email protected]> Authored: Tue Feb 24 12:37:52 2015 +0300 Committer: sevdokimov <[email protected]> Committed: Tue Feb 24 12:37:52 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheApiExample.java | 4 +- .../ignite/internal/GridKernalContext.java | 8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java | 5 +- .../discovery/GridDiscoveryManager.java | 26 +- .../processors/rest/GridRestProcessor.java | 85 +++---- .../securesession/GridSecureSession.java | 60 ----- .../GridSecureSessionProcessor.java | 59 ----- .../os/GridOsSecureSessionProcessor.java | 61 ----- .../security/GridSecurityContext.java | 251 ------------------- .../security/GridSecurityProcessor.java | 6 +- .../processors/security/SecurityContext.java | 56 +++++ .../security/os/GridOsSecurityProcessor.java | 146 +---------- .../optimized/optimized-classnames.properties | 1 - .../DiscoverySpiNodeAuthenticator.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 139 +++++----- .../discovery/AbstractDiscoverySelfTest.java | 15 -- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 23 -- .../ignite/testframework/junits/IgniteMock.java | 1 - .../junits/spi/GridSpiAbstractTest.java | 12 - pom.xml | 2 +- 21 files changed, 192 insertions(+), 782 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71896e2a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71896e2a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71896e2a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71896e2a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java ----------------------------------------------------------------------
