Merge branch 'sprint-1' into ignite-236
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03ac850a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03ac850a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03ac850a Branch: refs/heads/ignite-226 Commit: 03ac850af49a8bf3a65e1c45bcdca4f7b7a23da5 Parents: cc4cdfb e9af686 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Feb 13 13:24:17 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Feb 13 13:24:17 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 100 ++-- .../cache/store/jdbc/CacheJdbcPojoStore.java | 8 +- .../managers/deployment/GridDeployment.java | 3 - .../deployment/GridDeploymentManager.java | 3 - .../GridDeploymentPerLoaderStore.java | 3 - .../GridDeploymentPerVersionStore.java | 3 - .../distributed/GridDistributedCacheEntry.java | 3 - .../distributed/dht/GridDhtCacheEntry.java | 3 - .../dht/atomic/GridDhtAtomicCacheEntry.java | 3 - .../colocated/GridDhtColocatedCacheEntry.java | 3 - .../distributed/near/GridNearCacheEntry.java | 3 - .../cache/local/GridLocalCacheEntry.java | 3 - .../cache/query/GridCacheQueryManager.java | 3 - .../cache/transactions/IgniteTxAdapter.java | 3 - .../handlers/cache/GridCacheCommandHandler.java | 11 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 7 +- .../util/lang/GridMetadataAwareAdapter.java | 3 - .../ignite/internal/visor/cache/VisorCache.java | 51 -- .../visor/cache/VisorCacheConfiguration.java | 62 ++- .../visor/cache/VisorCacheTypeMetadata.java | 16 + .../visor/node/VisorGridConfiguration.java | 2 +- .../ignite/lang/IgniteProductVersion.java | 12 +- .../apache/ignite/logger/java/JavaLogger.java | 3 - .../communication/tcp/TcpCommunicationSpi.java | 3 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 8 +- .../product/GridProductVersionSelfTest.java | 20 + .../junits/logger/GridTestLog4jLogger.java | 3 - .../core/src/test/webapp/META-INF/gg-config.xml | 349 -------------- .../webapp/META-INF/ignite-webapp-config.xml | 349 ++++++++++++++ modules/core/src/test/webapp/WEB-INF/web.xml | 6 +- .../fs/hadoop/GridGgfsHadoopJclLogger.java | 3 - .../GridHadoopExternalCommunication.java | 3 +- .../ignite/logger/jcl/IgniteJclLogger.java | 3 - .../apache/ignite/logger/log4j/Log4JLogger.java | 6 +- .../processors/schedule/ScheduleFutureImpl.java | 3 - .../ignite/logger/slf4j/GridSlf4jLogger.java | 3 - .../ignite/cache/websession/GridWebSession.java | 286 ------------ .../cache/websession/GridWebSessionFilter.java | 466 ------------------- .../websession/GridWebSessionListener.java | 196 -------- .../cache/websession/IgniteWebSession.java | 286 ++++++++++++ .../websession/IgniteWebSessionFilter.java | 466 +++++++++++++++++++ .../websession/IgniteWebSessionListener.java | 196 ++++++++ .../internal/websession/WebSessionSelfTest.java | 8 +- .../websession/WebSessionServerStart.java | 2 +- .../internal/websession/WebSessionTest.java | 2 +- pom.xml | 2 +- 46 files changed, 1490 insertions(+), 1490 deletions(-) ----------------------------------------------------------------------
