Merge branch 'ignite-1.6' into ignite-3149
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b30cdcf8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b30cdcf8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b30cdcf8 Branch: refs/heads/ignite-3149 Commit: b30cdcf819b4a4ef1d272b2c3486e70d19fd6afd Parents: c0dd5dd b369d03 Author: vozerov-gridgain <[email protected]> Authored: Tue May 17 14:17:54 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue May 17 14:17:54 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheTtlManager.java | 5 +- .../WebSessionAttributeProcessor.java | 134 +++++ .../internal/websession/WebSessionEntity.java | 193 +++++++ .../ignite/cache/websession/WebSession.java | 14 +- .../cache/websession/WebSessionFilter.java | 499 ++++++++++++++++--- .../cache/websession/WebSessionListener.java | 117 +---- .../ignite/cache/websession/WebSessionV2.java | 405 +++++++++++++++ .../IgniteWebSessionSelfTestSuite.java | 35 ++ .../internal/websession/WebSessionSelfTest.java | 268 ++++++++-- .../webapp2/META-INF/ignite-webapp-config.xml | 279 +++++++++++ modules/web/src/test/webapp2/WEB-INF/web.xml | 45 ++ .../cache/IgniteCacheAbstractBenchmark.java | 5 + 12 files changed, 1779 insertions(+), 220 deletions(-) ----------------------------------------------------------------------
