Merge branches 'ignite-236' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/d56c4408 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d56c4408 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d56c4408 Branch: refs/heads/ignite-230 Commit: d56c4408e430676250997356d57dff8625990a0f Parents: 03ac850 c98696d Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 13 15:27:33 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 13 15:27:33 2015 +0300 ---------------------------------------------------------------------- config/ignite-log4j.xml | 2 +- examples/pom-standalone.xml | 2 +- .../apache/ignite/cache/CacheProjection.java | 4 +- .../ignite/cache/cloner/CacheBasicCloner.java | 34 --- .../apache/ignite/cache/cloner/CacheCloner.java | 57 ----- .../ignite/cache/cloner/CacheDeepCloner.java | 87 -------- .../org/apache/ignite/cache/cloner/package.html | 24 --- .../configuration/CacheConfiguration.java | 34 --- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/events/EventType.java | 2 - .../processors/cache/GridCacheAdapter.java | 66 ++++-- .../processors/cache/GridCacheAttributes.java | 13 -- .../processors/cache/GridCacheContext.java | 11 +- .../processors/cache/GridCacheEntryEx.java | 7 +- .../processors/cache/GridCacheMapEntry.java | 36 +++- .../processors/cache/GridCacheProcessor.java | 8 +- .../cache/GridCacheProjectionImpl.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 8 +- .../cache/IgniteCacheExpiryPolicy.java | 6 + .../processors/cache/IgniteCacheProxy.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 27 ++- .../dht/atomic/GridDhtAtomicCache.java | 96 +-------- .../dht/colocated/GridDhtColocatedCache.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 19 +- .../local/atomic/GridLocalAtomicCache.java | 7 +- .../cache/query/GridCacheQueryManager.java | 109 ++++++++-- .../visor/cache/VisorCacheConfiguration.java | 1 - .../optimized/optimized-classnames.properties | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 12 -- .../cache/GridCacheLifecycleAwareSelfTest.java | 23 -- .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../cache/GridCacheVersionMultinodeTest.java | 208 +++++++++++++++++++ .../IgniteCacheExpiryPolicyAbstractTest.java | 20 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../IgniteLog4jDailyRollingFileAppender.java | 77 ------- ...IgniteLog4jExternallyRolledFileAppender.java | 63 ------ .../logger/log4j/IgniteLog4jFileAppender.java | 107 ---------- .../logger/log4j/IgniteLog4jFileAware.java | 32 --- .../logger/log4j/IgniteLog4jNodeIdFilePath.java | 64 ------ .../log4j/IgniteLog4jRollingFileAppender.java | 90 -------- .../log4j/Log4JDailyRollingFileAppender.java | 77 +++++++ .../Log4JExternallyRolledFileAppender.java | 63 ++++++ .../ignite/logger/log4j/Log4JFileAppender.java | 107 ++++++++++ .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/log4j/Log4jFileAware.java | 32 +++ .../logger/log4j/Log4jNodeIdFilePath.java | 64 ++++++ .../logger/log4j/Log4jRollingFileAppender.java | 90 ++++++++ .../log4j/GridLog4jCorrectFileNameTest.java | 12 +- pom.xml | 29 +-- 51 files changed, 903 insertions(+), 966 deletions(-) ----------------------------------------------------------------------
