Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-227
Conflicts:
examples/pom-standalone.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0c49802
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0c49802
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0c49802
Branch: refs/heads/ignite-189
Commit: e0c4980292b52e038668528c90573a7b8e43d584
Parents: a9c37ac c98696d
Author: AKuznetsov <[email protected]>
Authored: Fri Feb 13 19:29:55 2015 +0700
Committer: AKuznetsov <[email protected]>
Committed: Fri Feb 13 19:29:55 2015 +0700
----------------------------------------------------------------------
config/ignite-log4j.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 -
.../managers/deployment/GridDeployment.java | 3 -
.../deployment/GridDeploymentManager.java | 3 -
.../GridDeploymentPerLoaderStore.java | 3 -
.../GridDeploymentPerVersionStore.java | 3 -
.../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/GridDistributedCacheEntry.java | 3 -
.../distributed/dht/GridDhtCacheAdapter.java | 27 ++-
.../distributed/dht/GridDhtCacheEntry.java | 3 -
.../dht/atomic/GridDhtAtomicCache.java | 96 +--------
.../dht/atomic/GridDhtAtomicCacheEntry.java | 3 -
.../dht/colocated/GridDhtColocatedCache.java | 4 +-
.../colocated/GridDhtColocatedCacheEntry.java | 3 -
.../distributed/near/GridNearCacheAdapter.java | 2 +-
.../distributed/near/GridNearCacheEntry.java | 3 -
.../cache/distributed/near/GridNearTxLocal.java | 19 +-
.../cache/local/GridLocalCacheEntry.java | 3 -
.../local/atomic/GridLocalAtomicCache.java | 7 +-
.../cache/query/GridCacheQueryManager.java | 112 +++++++---
.../cache/transactions/IgniteTxAdapter.java | 3 -
.../shmem/IpcSharedMemoryServerEndpoint.java | 7 +-
.../util/lang/GridMetadataAwareAdapter.java | 3 -
.../ignite/internal/visor/cache/VisorCache.java | 51 -----
.../visor/cache/VisorCacheConfiguration.java | 63 +++++-
.../visor/cache/VisorCacheTypeMetadata.java | 16 ++
.../visor/node/VisorGridConfiguration.java | 2 +-
.../apache/ignite/logger/java/JavaLogger.java | 3 -
.../optimized/optimized-classnames.properties | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 3 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
...idCacheConfigurationConsistencySelfTest.java | 12 --
.../cache/GridCacheLifecycleAwareSelfTest.java | 23 --
.../processors/cache/GridCacheTestEntryEx.java | 8 +-
.../cache/GridCacheVersionMultinodeTest.java | 208 +++++++++++++++++++
.../IgniteCacheExpiryPolicyAbstractTest.java | 20 ++
.../junits/logger/GridTestLog4jLogger.java | 3 -
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../fs/hadoop/GridGgfsHadoopJclLogger.java | 3 -
.../GridHadoopExternalCommunication.java | 3 +-
.../ignite/logger/jcl/IgniteJclLogger.java | 3 -
.../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 | 12 +-
.../ignite/logger/log4j/Log4jFileAware.java | 32 +++
.../logger/log4j/Log4jNodeIdFilePath.java | 64 ++++++
.../logger/log4j/Log4jRollingFileAppender.java | 90 ++++++++
.../log4j/GridLog4jCorrectFileNameTest.java | 12 +-
.../processors/schedule/ScheduleFutureImpl.java | 3 -
.../ignite/logger/slf4j/GridSlf4jLogger.java | 3 -
pom.xml | 29 +--
74 files changed, 982 insertions(+), 1090 deletions(-)
----------------------------------------------------------------------
