Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Conflicts:
modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5c2f069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5c2f069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5c2f069
Branch: refs/heads/ignite-96
Commit: f5c2f069e5c1f86bb462f3387b064f31f2c91e64
Parents: 5df2b65 b860d36
Author: Yakov Zhdanov <[email protected]>
Authored: Fri Feb 6 18:51:03 2015 +0300
Committer: Yakov Zhdanov <[email protected]>
Committed: Fri Feb 6 18:51:03 2015 +0300
----------------------------------------------------------------------
assembly/core-jar.xml | 2 +-
assembly/dependencies-fabric.xml | 2 +-
assembly/dependencies-hadoop.xml | 2 +-
assembly/dependencies-optional-fabric.xml | 2 +-
assembly/dependencies-optional-hadoop.xml | 2 +-
assembly/dependencies-visor-console.xml | 2 +-
assembly/dependencies-visor-trial.xml | 2 +-
assembly/release-base-fabric.xml | 2 +-
assembly/release-base.xml | 2 +-
assembly/release-fabric.xml | 2 +-
assembly/release-hadoop.xml | 2 +-
assembly/test.xml | 2 +-
bin/ignite.bat | 30 +-
bin/ignite.sh | 30 +-
bin/igniterouter.bat | 30 +-
bin/igniterouter.sh | 30 +-
bin/ignitevisorcmd.bat | 30 +-
bin/ignitevisorcmd.sh | 30 +-
bin/include/functions.sh | 26 +-
bin/include/hadoop-classpath.bat | 26 +-
bin/include/hadoop-classpath.sh | 30 +-
bin/include/parseargs.bat | 30 +-
bin/include/parseargs.sh | 30 +-
bin/include/service.sh | 26 +-
bin/include/setenv.bat | 30 +-
bin/include/setenv.sh | 26 +-
bin/include/target-classpath.bat | 26 +-
bin/include/target-classpath.sh | 26 +-
bin/setup-hadoop.bat | 26 +-
bin/setup-hadoop.sh | 30 +-
config/default-config.xml | 2 +-
config/fabric/default-config.xml | 2 +-
config/hadoop/default-config.xml | 2 +-
config/ignite-log4j.xml | 2 +-
config/router/default-router.xml | 2 +-
docs/core-site.ignite.xml | 3 +-
docs/hive-site.ignite.xml | 3 +-
docs/mapred-site.ignite.xml | 15 +-
examples/config/example-cache.xml | 2 +-
examples/config/example-compute.xml | 2 +-
examples/config/example-streamer.xml | 2 +-
examples/config/filesystem/core-site.xml | 2 +-
examples/config/filesystem/example-ignitefs.xml | 2 +-
.../hibernate/example-hibernate-L2-cache.xml | 6 +-
examples/config/servlet/WEB-INF/web.xml | 2 +-
examples/pom-standalone.xml | 2 +-
examples/pom.xml | 2 +-
.../examples/compute/failover/package.html | 3 +-
.../examples/compute/montecarlo/package.html | 2 +-
.../apache/ignite/examples/compute/package.html | 3 +-
.../datagrid/datastructures/package.html | 3 +-
.../examples/datagrid/hibernate/package.html | 3 +-
.../ignite/examples/datagrid/package.html | 3 +-
.../examples/datagrid/starschema/package.html | 2 +-
.../examples/datagrid/store/dummy/package.html | 2 +-
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 2 +-
.../datagrid/store/hibernate/package.html | 2 +-
.../examples/datagrid/store/jdbc/package.html | 2 +-
.../ignite/examples/datagrid/store/package.html | 2 +-
.../apache/ignite/examples/events/package.html | 2 +-
.../org/apache/ignite/examples/fs/package.html | 3 +-
.../ignite/examples/messaging/package.html | 2 +-
.../examples/misc/client/memcache/package.html | 3 +-
.../ignite/examples/misc/client/package.html | 2 +-
.../examples/misc/deployment/package.html | 2 +-
.../ignite/examples/misc/lifecycle/package.html | 2 +-
.../apache/ignite/examples/misc/package.html | 2 +-
.../examples/misc/springbean/package.html | 2 +-
.../examples/misc/springbean/spring-bean.xml | 2 +-
.../org/apache/ignite/examples/package.html | 2 +-
.../ignite/examples/streaming/package.html | 2 +-
license/header-customisation.xml | 51 +
license/header.txt | 14 +
modules/aop/pom.xml | 2 +-
.../compute/gridify/aop/aspectj/package.html | 2 +-
.../compute/gridify/aop/spring/package.html | 4 +-
.../test/config/aop/aspectj/META-INF/aop.xml | 2 +-
.../ignite/gridify/hierarchy/package.html | 4 +-
.../java/org/apache/ignite/gridify/package.html | 4 +-
.../loadtests/direct/singlesplit/package.html | 2 +-
.../src/test/java/org/test/gridify/package.html | 3 +-
modules/aws/pom.xml | 3 +-
.../ignite/spi/checkpoint/s3/package.html | 2 +-
.../spi/discovery/tcp/ipfinder/s3/package.html | 3 +-
.../ignite/spi/checkpoint/s3/package.html | 2 +-
.../spi/discovery/tcp/ipfinder/s3/package.html | 3 +-
.../config/grid-client-spring-config.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/clients/src/test/bin/start-nodes-ssh.sh | 26 +-
modules/clients/src/test/bin/start-nodes.cmd | 17 +
modules/clients/src/test/bin/start-nodes.sh | 26 +-
modules/clients/src/test/bin/stop-nodes.cmd | 17 +
modules/clients/src/test/bin/stop-nodes.sh | 26 +-
.../client/ClientDefaultCacheSelfTest.java | 4 +-
.../ignite/client/integration/package.html | 2 +-
.../apache/ignite/client/router/package.html | 2 +-
.../rest/AbstractRestProcessorSelfTest.java | 12 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 68 +-
.../JettyRestProcessorAbstractSelfTest.java | 113 +-
.../src/test/resources/jetty/rest-jetty-ssl.xml | 2 +-
.../src/test/resources/jetty/rest-jetty.xml | 2 +-
.../test/resources/jetty/router-jetty-ssl.xml | 2 +-
.../src/test/resources/jetty/router-jetty.xml | 2 +-
modules/clients/src/test/resources/log4j.xml | 2 +-
.../clients/src/test/resources/spring-cache.xml | 2 +-
.../src/test/resources/spring-router-ssl.xml | 2 +-
.../src/test/resources/spring-router.xml | 2 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
modules/core/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteCache.java | 2 +
.../cache/affinity/consistenthash/package.html | 2 +-
.../ignite/cache/affinity/fair/package.html | 2 +-
.../apache/ignite/cache/affinity/package.html | 2 +-
.../cache/affinity/rendezvous/package.html | 3 +-
.../org/apache/ignite/cache/cloner/package.html | 2 +-
.../ignite/cache/eviction/fifo/package.html | 3 +-
.../ignite/cache/eviction/ggfs/package.html | 3 +-
.../ignite/cache/eviction/lru/package.html | 3 +-
.../apache/ignite/cache/eviction/package.html | 3 +-
.../ignite/cache/eviction/random/package.html | 3 +-
.../java/org/apache/ignite/cache/package.html | 2 +-
.../org/apache/ignite/cache/query/package.html | 3 +-
.../cache/store/jdbc/dialect/package.html | 2 +-
.../apache/ignite/cache/store/jdbc/package.html | 2 +-
.../org/apache/ignite/cache/store/package.html | 3 +-
.../apache/ignite/client/balancer/package.html | 2 +-
.../org/apache/ignite/client/impl/package.html | 3 +-
.../ignite/client/marshaller/jdk/package.html | 2 +-
.../client/marshaller/optimized/package.html | 2 +-
.../ignite/client/marshaller/package.html | 3 +-
.../java/org/apache/ignite/client/package.html | 3 +-
.../ignite/client/router/impl/package.html | 3 +-
.../apache/ignite/client/router/package.html | 3 +-
.../org/apache/ignite/client/ssl/package.html | 2 +-
.../org/apache/ignite/client/util/package.html | 2 +-
.../ignite/compute/gridify/aop/package.html | 3 +-
.../apache/ignite/compute/gridify/package.html | 3 +-
.../java/org/apache/ignite/compute/package.html | 2 +-
.../org/apache/ignite/dataload/package.html | 3 +-
.../java/org/apache/ignite/events/package.html | 3 +-
.../org/apache/ignite/fs/mapreduce/package.html | 3 +-
.../ignite/fs/mapreduce/records/package.html | 2 +-
.../main/java/org/apache/ignite/fs/package.html | 2 +-
.../ignite/internal/executor/package.html | 3 +-
.../ignite/internal/fs/common/package.html | 3 +-
.../internal/managers/checkpoint/package.html | 3 +-
.../internal/managers/collision/package.html | 3 +-
.../managers/communication/package.html | 3 +-
.../internal/managers/deployment/package.html | 3 +-
.../deployment/protocol/gg/package.html | 3 +-
.../internal/managers/discovery/package.html | 3 +-
.../internal/managers/eventstorage/package.html | 3 +-
.../internal/managers/failover/package.html | 2 +-
.../internal/managers/indexing/package.html | 2 +-
.../internal/managers/loadbalancer/package.html | 3 +-
.../ignite/internal/managers/package.html | 3 +-
.../managers/securesession/os/package.html | 3 +-
.../managers/securesession/package.html | 3 +-
.../internal/managers/security/os/package.html | 3 +-
.../internal/managers/security/package.html | 3 +-
.../internal/managers/swapspace/package.html | 3 +-
.../apache/ignite/internal/mxbean/package.html | 2 +-
.../org/apache/ignite/internal/package.html | 2 +-
.../internal/processors/affinity/package.html | 3 +-
.../processors/cache/GridCacheUtils.java | 19 +
.../processors/cache/IgniteCacheProxy.java | 4 +
.../cache/query/GridCacheSqlQuery.java | 22 +-
.../cache/query/GridCacheSqlResult.java | 22 +-
.../cache/query/GridCacheTwoStepQuery.java | 22 +-
.../internal/processors/closure/package.html | 3 +-
.../internal/processors/dataload/package.html | 3 +-
.../ignite/internal/processors/dr/package.html | 3 +-
.../internal/processors/email/package.html | 2 +-
.../ignite/internal/processors/fs/package.html | 3 +-
.../internal/processors/hadoop/package.html | 2 +-
.../ignite/internal/processors/job/package.html | 3 +-
.../internal/processors/jobmetrics/package.html | 2 +-
.../internal/processors/license/os/package.html | 3 +-
.../internal/processors/license/package.html | 2 +-
.../ignite/internal/processors/package.html | 3 +-
.../internal/processors/port/package.html | 2 +-
.../processors/portable/os/package.html | 3 +-
.../internal/processors/portable/package.html | 3 +-
.../internal/processors/resource/package.html | 3 +-
.../processors/rest/client/message/package.html | 3 +-
.../processors/rest/handlers/cache/package.html | 3 +-
.../processors/rest/handlers/log/package.html | 3 +-
.../processors/rest/handlers/package.html | 3 +-
.../processors/rest/handlers/top/package.html | 3 +-
.../rest/handlers/version/package.html | 3 +-
.../internal/processors/rest/package.html | 3 +-
.../processors/rest/protocols/package.html | 3 +-
.../processors/rest/protocols/tcp/package.html | 3 +-
.../processors/rest/request/package.html | 3 +-
.../internal/processors/schedule/package.html | 2 +-
.../processors/segmentation/package.html | 3 +-
.../internal/processors/session/package.html | 3 +-
.../internal/processors/streamer/package.html | 3 +-
.../internal/processors/task/package.html | 3 +-
.../internal/processors/timeout/package.html | 3 +-
.../apache/ignite/internal/product/package.html | 3 +-
.../ignite/internal/util/future/package.html | 3 +-
.../ignite/internal/util/gridify/package.html | 3 +-
.../internal/util/ipc/loopback/package.html | 3 +-
.../ignite/internal/util/ipc/package.html | 3 +-
.../ignite/internal/util/ipc/shmem/package.html | 3 +-
.../ignite/internal/util/nio/package.html | 3 +-
.../ignite/internal/util/nio/ssl/package.html | 3 +-
.../apache/ignite/internal/util/package.html | 2 +-
.../internal/util/portscanner/package.html | 3 +-
.../ignite/internal/util/scala/package.html | 2 +-
.../ignite/internal/util/snaptree/package.html | 2 +-
.../ignite/internal/util/test/package.html | 2 +-
.../ignite/internal/util/tostring/package.html | 3 +-
.../internal/util/typedef/internal/package.html | 3 +-
.../ignite/internal/util/typedef/package.html | 3 +-
.../ignite/internal/util/worker/package.html | 2 +-
.../java/org/apache/ignite/interop/package.html | 22 +-
.../java/org/apache/ignite/jdbc/package.html | 3 +-
.../org/apache/ignite/jdbc/typedef/package.html | 3 +-
.../org/apache/ignite/jdbc/util/package.html | 3 +-
.../java/org/apache/ignite/lang/package.html | 3 +-
.../org/apache/ignite/logger/java/package.html | 3 +-
.../java/org/apache/ignite/logger/package.html | 3 +-
.../java/org/apache/ignite/managed/package.html | 2 +-
.../apache/ignite/marshaller/jdk/package.html | 2 +-
.../optimized-classnames.previous.properties | 17 -
.../optimized/optimized-classnames.properties | 17 -
.../ignite/marshaller/optimized/package.html | 2 +-
.../org/apache/ignite/marshaller/package.html | 3 +-
.../org/apache/ignite/messaging/package.html | 2 +-
.../java/org/apache/ignite/mxbean/package.html | 3 +-
.../main/java/org/apache/ignite/package.html | 3 +-
.../apache/ignite/plugin/security/package.html | 3 +-
.../ignite/plugin/segmentation/package.html | 2 +-
.../org/apache/ignite/portables/package.html | 3 +-
.../org/apache/ignite/resources/package.html | 3 +-
.../org/apache/ignite/scheduler/package.html | 3 +-
.../ignite/spi/authentication/noop/package.html | 3 +-
.../ignite/spi/authentication/package.html | 3 +-
.../ignite/spi/checkpoint/cache/package.html | 3 +-
.../ignite/spi/checkpoint/jdbc/package.html | 3 +-
.../ignite/spi/checkpoint/noop/package.html | 3 +-
.../apache/ignite/spi/checkpoint/package.html | 2 +-
.../ignite/spi/checkpoint/sharedfs/package.html | 3 +-
.../ignite/spi/collision/fifoqueue/package.html | 3 +-
.../spi/collision/jobstealing/package.html | 3 +-
.../ignite/spi/collision/noop/package.html | 3 +-
.../apache/ignite/spi/collision/package.html | 3 +-
.../spi/collision/priorityqueue/package.html | 3 +-
.../ignite/spi/communication/package.html | 3 +-
.../ignite/spi/communication/tcp/package.html | 3 +-
.../ignite/spi/deployment/local/package.html | 3 +-
.../apache/ignite/spi/deployment/package.html | 3 +-
.../apache/ignite/spi/discovery/package.html | 3 +-
.../spi/discovery/tcp/internal/package.html | 3 +-
.../discovery/tcp/ipfinder/jdbc/package.html | 3 +-
.../tcp/ipfinder/multicast/package.html | 3 +-
.../spi/discovery/tcp/ipfinder/package.html | 3 +-
.../tcp/ipfinder/sharedfs/package.html | 3 +-
.../spi/discovery/tcp/ipfinder/vm/package.html | 3 +-
.../spi/discovery/tcp/messages/package.html | 3 +-
.../ignite/spi/discovery/tcp/package.html | 3 +-
.../ignite/spi/eventstorage/memory/package.html | 2 +-
.../apache/ignite/spi/eventstorage/package.html | 2 +-
.../ignite/spi/failover/always/package.html | 3 +-
.../spi/failover/jobstealing/package.html | 2 +-
.../ignite/spi/failover/never/package.html | 3 +-
.../org/apache/ignite/spi/failover/package.html | 2 +-
.../org/apache/ignite/spi/indexing/package.html | 3 +-
.../spi/loadbalancing/adaptive/package.html | 2 +-
.../ignite/spi/loadbalancing/package.html | 3 +-
.../spi/loadbalancing/roundrobin/package.html | 3 +-
.../loadbalancing/weightedrandom/package.html | 2 +-
.../java/org/apache/ignite/spi/package.html | 2 +-
.../ignite/spi/securesession/noop/package.html | 3 +-
.../ignite/spi/securesession/package.html | 2 +-
.../ignite/spi/swapspace/file/package.html | 3 +-
.../ignite/spi/swapspace/noop/package.html | 3 +-
.../apache/ignite/spi/swapspace/package.html | 3 +-
.../apache/ignite/startup/cmdline/package.html | 3 +-
.../ignite/streamer/index/hash/package.html | 3 +-
.../apache/ignite/streamer/index/package.html | 3 +-
.../ignite/streamer/index/tree/package.html | 2 +-
.../org/apache/ignite/streamer/package.html | 3 +-
.../apache/ignite/streamer/router/package.html | 3 +-
.../apache/ignite/streamer/window/package.html | 3 +-
.../java/org/apache/ignite/thread/package.html | 3 +-
.../IgniteTxHeuristicException.java | 22 +-
.../IgniteTxOptimisticException.java | 22 +-
.../transactions/IgniteTxRollbackException.java | 22 +-
.../transactions/IgniteTxTimeoutException.java | 22 +-
.../core/src/test/bin/start-nodes-custom.bat | 26 +-
modules/core/src/test/bin/start-nodes-custom.sh | 26 +-
.../spring-cache-client-benchmark-1.xml | 2 +-
.../spring-cache-client-benchmark-2.xml | 2 +-
.../spring-cache-client-benchmark-3.xml | 2 +-
.../test/config/default-spring-url-testing.xml | 4 +-
.../core/src/test/config/discovery-stress.xml | 2 +-
modules/core/src/test/config/example-cache.xml | 2 +-
modules/core/src/test/config/ggfs-loopback.xml | 2 +-
modules/core/src/test/config/ggfs-shmem.xml | 2 +-
.../hadoop/core-site-loopback-secondary.xml | 2 +-
.../test/config/hadoop/core-site-loopback.xml | 2 +-
.../test/config/hadoop/core-site-secondary.xml | 2 +-
.../core/src/test/config/hadoop/core-site.xml | 2 +-
.../src/test/config/io-manager-benchmark.xml | 2 +-
.../src/test/config/job-loadtest/client.xml | 3 +-
.../src/test/config/job-loadtest/server.xml | 3 +-
modules/core/src/test/config/jobs-load-base.xml | 4 +-
.../core/src/test/config/jobs-load-client.xml | 4 +-
.../core/src/test/config/jobs-load-server.xml | 4 +-
.../src/test/config/load/cache-benchmark.xml | 2 +-
.../test/config/load/cache-client-benchmark.xml | 2 +-
.../config/load/dsi-49-server-production.xml | 3 +-
.../core/src/test/config/load/dsi-load-base.xml | 2 +-
.../src/test/config/load/dsi-load-client.xml | 2 +-
.../src/test/config/load/dsi-load-server.xml | 2 +-
.../src/test/config/load/merge-sort-base.xml | 2 +-
.../test/config/loaders/grid-cfg-2-grids.xml | 4 +-
.../core/src/test/config/loaders/grid-cfg.xml | 4 +-
modules/core/src/test/config/log4j-test.xml | 2 +-
.../core/src/test/config/spring-cache-load.xml | 2 +-
.../config/spring-cache-put-remove-load.xml | 2 +-
.../core/src/test/config/spring-cache-swap.xml | 2 +-
.../src/test/config/spring-cache-teststore.xml | 2 +-
.../core/src/test/config/spring-multicache.xml | 2 +-
.../src/test/config/spring-start-nodes-attr.xml | 2 +-
.../core/src/test/config/spring-start-nodes.xml | 2 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 26 +-
.../average/spring-streamer-average-base.xml | 2 +-
.../average/spring-streamer-average-local.xml | 2 +-
.../average/spring-streamer-average-random.xml | 2 +-
.../config/streamer/spring-streamer-base.xml | 2 +-
.../test/config/websession/spring-cache-1.xml | 2 +-
.../test/config/websession/spring-cache-2.xml | 2 +-
.../test/config/websession/spring-cache-3.xml | 2 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 10 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 12 +-
.../ignite/cache/store/jdbc/model/package.html | 2 +-
.../apache/ignite/cache/store/jdbc/package.html | 3 +-
.../org/apache/ignite/cache/store/package.html | 3 +-
.../internal/GridCacheProjectionRemoveTest.java | 6 +-
.../internal/managers/checkpoint/package.html | 3 +-
.../managers/communication/package.html | 3 +-
.../internal/managers/deployment/package.html | 3 +-
.../ignite/internal/managers/package.html | 3 +-
.../internal/managers/swapspace/package.html | 3 +-
.../org/apache/ignite/internal/package.html | 2 +-
.../GridCacheAbstractFailoverSelfTest.java | 83 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 206 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2260 +++---------------
.../GridCacheAbstractIteratorsSelfTest.java | 84 +-
.../GridCacheAbstractProjectionSelfTest.java | 857 -------
.../cache/GridCacheAbstractSelfTest.java | 81 +-
.../cache/GridCacheAffinityApiSelfTest.java | 42 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 13 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 115 +-
...acheBasicStoreMultithreadedAbstractTest.java | 5 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 8 +-
.../GridCacheMissingCommitVersionSelfTest.java | 12 +-
.../cache/GridCachePartitionedWritesTest.java | 11 +-
.../cache/GridCacheStorePutxSelfTest.java | 17 +-
.../cache/GridCacheSwapReloadSelfTest.java | 24 +-
...idCacheValueConsistencyAbstractSelfTest.java | 34 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 69 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 4 +-
...acheEntrySetIterationPreloadingSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 14 +-
.../dht/GridCacheColocatedDebugTest.java | 28 +-
...dCachePartitionedOnlyProjectionSelfTest.java | 32 -
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 324 +--
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 72 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 132 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 152 +-
.../near/GridCacheNearOneNodeSelfTest.java | 44 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 215 +-
.../near/GridCacheNearReadersSelfTest.java | 14 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 47 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 4 +-
.../GridCachePartitionedEntryLockSelfTest.java | 74 -
...titionedExplicitLockNodeFailureSelfTest.java | 24 +-
...GridCachePartitionedFilteredPutSelfTest.java | 55 +-
.../GridCachePartitionedFullApiSelfTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 6 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 214 +-
.../GridCachePartitionedProjectionSelfTest.java | 155 --
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 17 +-
.../GridCacheReplicatedProjectionSelfTest.java | 66 -
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
.../IgniteCacheLoadAllAbstractTest.java | 6 +-
.../IgniteCacheStoreSessionAbstractTest.java | 17 +
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 149 +-
.../GridCacheLocalAtomicProjectionSelfTest.java | 32 -
.../local/GridCacheLocalFullApiSelfTest.java | 63 +-
.../local/GridCacheLocalIteratorsSelfTest.java | 51 +-
.../local/GridCacheLocalProjectionSelfTest.java | 38 -
.../internal/processors/closure/package.html | 3 +-
.../GridDataLoaderProcessorSelfTest.java | 2 +-
.../ignite/internal/processors/fs/package.html | 3 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 4 +-
.../apache/ignite/internal/updatestatus.html | 3 +-
.../ignite/internal/util/nio/package.html | 3 +-
.../ignite/internal/util/tostring/package.html | 3 +-
.../java/org/apache/ignite/lang/package.html | 3 +-
.../org/apache/ignite/lang/utils/package.html | 2 +-
.../org/apache/ignite/loadtest/package.html | 3 +-
.../GridCacheWriteBehindStoreLoadTest.java | 19 +-
.../capacity/spring-capacity-cache.xml | 2 +-
.../colocation/GridTestLifecycleBean.java | 3 +-
.../loadtests/colocation/spring-colocation.xml | 2 +-
.../loadtests/direct/multisplit/package.html | 2 +-
.../loadtests/direct/newnodes/package.html | 2 +-
.../loadtests/direct/redeploy/package.html | 2 +-
.../loadtests/direct/session/package.html | 2 +-
.../loadtests/direct/stealing/package.html | 2 +-
.../apache/ignite/loadtests/dsi/package.html | 3 +-
.../apache/ignite/loadtests/job/package.html | 3 +-
.../org/apache/ignite/logger/java/package.html | 3 +-
.../apache/ignite/marshaller/jdk/package.html | 3 +-
.../ignite/marshaller/optimized/package.html | 3 +-
.../org/apache/ignite/marshaller/package.html | 3 +-
.../java/org/apache/ignite/p2p/package.html | 3 +-
.../test/java/org/apache/ignite/package.html | 3 +-
.../java/org/apache/ignite/session/package.html | 2 +-
.../ignite/spi/checkpoint/cache/package.html | 2 +-
.../ignite/spi/checkpoint/jdbc/package.html | 2 +-
.../apache/ignite/spi/checkpoint/package.html | 2 +-
.../ignite/spi/checkpoint/sharedfs/package.html | 3 +-
.../ignite/spi/collision/fifoqueue/package.html | 3 +-
.../spi/collision/jobstealing/package.html | 3 +-
.../apache/ignite/spi/collision/package.html | 3 +-
.../spi/collision/priorityqueue/package.html | 3 +-
.../ignite/spi/communication/package.html | 2 +-
.../ignite/spi/communication/tcp/package.html | 3 +-
.../ignite/spi/deployment/local/package.html | 3 +-
.../apache/ignite/spi/discovery/package.html | 3 +-
.../discovery/tcp/ipfinder/jdbc/package.html | 3 +-
.../spi/discovery/tcp/ipfinder/package.html | 2 +-
.../tcp/ipfinder/sharedfs/package.html | 3 +-
.../spi/discovery/tcp/ipfinder/vm/package.html | 3 +-
.../ignite/spi/discovery/tcp/package.html | 3 +-
.../ignite/spi/eventstorage/memory/package.html | 3 +-
.../ignite/spi/failover/always/package.html | 3 +-
.../spi/failover/jobstealing/package.html | 3 +-
.../ignite/spi/failover/never/package.html | 3 +-
.../org/apache/ignite/spi/failover/package.html | 2 +-
.../spi/loadbalancing/adaptive/package.html | 3 +-
.../ignite/spi/loadbalancing/package.html | 3 +-
.../spi/loadbalancing/roundrobin/package.html | 3 +-
.../loadbalancing/weightedrandom/package.html | 3 +-
.../java/org/apache/ignite/spi/package.html | 2 +-
.../apache/ignite/spi/swapspace/package.html | 3 +-
.../apache/ignite/startup/cmdline/package.html | 3 +-
.../java/org/apache/ignite/startup/package.html | 3 +-
.../apache/ignite/startup/servlet/package.html | 3 +-
.../ignite/testframework/config/package.html | 3 +-
.../ignite/testframework/http/package.html | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 22 +-
.../junits/common/GridCommonAbstractTest.java | 54 +
.../testframework/junits/common/package.html | 3 +-
.../ignite/testframework/junits/package.html | 2 +-
.../testframework/junits/spi/package.html | 3 +-
.../apache/ignite/testframework/package.html | 3 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 -
.../org/apache/ignite/testsuites/package.html | 2 +-
.../java/org/apache/ignite/util/package.html | 2 +-
.../src/test/resources/load/html/index.html | 17 +-
.../core/src/test/webapp/META-INF/gg-config.xml | 2 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 2 +-
modules/email/pom.xml | 2 +-
modules/extdata/p2p/META-INF/ignite.xml | 2 +-
modules/extdata/p2p/pom.xml | 2 +-
.../org/apache/ignite/tests/p2p/package.html | 3 +-
modules/extdata/uri/pom.xml | 2 +-
.../spi/deployment/uri/tasks/package.html | 2 +-
.../ignite/spi/deployment/uri/tasks/spring1.xml | 4 +-
.../ignite/spi/deployment/uri/tasks/spring2.xml | 4 +-
modules/hadoop/pom.xml | 2 +-
.../apache/ignite/client/hadoop/package.html | 3 +-
.../org/apache/ignite/fs/hadoop/package.html | 3 +-
.../org/apache/ignite/fs/hadoop/v1/package.html | 3 +-
.../org/apache/ignite/fs/hadoop/v2/package.html | 3 +-
.../main/java/org/apache/ignite/fs/package.html | 3 +-
.../ignite/internal/fs/hadoop/package.html | 3 +-
.../org/apache/ignite/internal/fs/package.html | 3 +-
modules/hibernate/pom.xml | 2 +-
.../apache/ignite/cache/hibernate/package.html | 2 +-
.../CacheHibernateBlobStoreEntry.hbm.xml | 6 +-
.../ignite/cache/store/hibernate/package.html | 3 +-
.../cache/store/hibernate/hibernate.cfg.xml | 6 +-
.../ignite/cache/store/hibernate/package.html | 3 +-
modules/indexing/pom.xml | 2 +-
.../internal/processors/query/h2/package.html | 2 +-
.../query/h2/sql/GridSqlAggregateFunction.java | 22 +-
.../processors/query/h2/sql/GridSqlAlias.java | 22 +-
.../processors/query/h2/sql/GridSqlColumn.java | 22 +-
.../processors/query/h2/sql/GridSqlConst.java | 22 +-
.../processors/query/h2/sql/GridSqlElement.java | 22 +-
.../query/h2/sql/GridSqlFunction.java | 22 +-
.../query/h2/sql/GridSqlFunctionType.java | 22 +-
.../processors/query/h2/sql/GridSqlJoin.java | 22 +-
.../query/h2/sql/GridSqlOperation.java | 22 +-
.../query/h2/sql/GridSqlOperationType.java | 22 +-
.../query/h2/sql/GridSqlParameter.java | 22 +-
.../query/h2/sql/GridSqlQueryParser.java | 22 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 22 +-
.../processors/query/h2/sql/GridSqlSelect.java | 22 +-
.../query/h2/sql/GridSqlSubquery.java | 22 +-
.../processors/query/h2/sql/GridSqlTable.java | 22 +-
.../processors/query/h2/sql/GridSqlValue.java | 22 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 22 +-
.../query/h2/twostep/GridMergeIndex.java | 22 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 22 +-
.../query/h2/twostep/GridMergeTable.java | 22 +-
.../h2/twostep/GridReduceQueryExecutor.java | 22 +-
.../query/h2/twostep/GridResultPage.java | 22 +-
.../twostep/messages/GridNextPageRequest.java | 22 +-
.../twostep/messages/GridNextPageResponse.java | 22 +-
.../query/h2/twostep/messages/GridQueryAck.java | 22 +-
.../twostep/messages/GridQueryFailResponse.java | 22 +-
.../h2/twostep/messages/GridQueryRequest.java | 22 +-
.../query/h2/sql/GridQueryParsingTest.java | 22 +-
modules/jcl/pom.xml | 2 +-
.../org/apache/ignite/logger/jcl/package.html | 3 +-
.../org/apache/ignite/logger/jcl/package.html | 3 +-
modules/jdk8-backport/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
.../apache/ignite/cache/jta/jndi/package.html | 2 +-
.../org/apache/ignite/cache/jta/package.html | 2 +-
.../ignite/cache/jta/reflect/package.html | 2 +-
.../processors/cache/GridCacheJtaSelfTest.java | 35 +-
modules/log4j/pom.xml | 2 +-
.../org/apache/ignite/logger/log4j/package.html | 2 +-
.../org/apache/ignite/logger/log4j/package.html | 3 +-
modules/rest-http/pom.xml | 2 +-
.../rest/protocols/http/jetty/package.html | 3 +-
.../rest/protocols/http/jetty/rest.html | 2 +-
modules/scalar/pom.xml | 2 +-
.../scalar/src/test/resources/spring-cache.xml | 2 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-load/pom.xml | 2 +-
.../schema-load/src/main/java/media/style.css | 17 +
.../apache/ignite/schema/load/model/Ignite.xml | 28 +-
modules/slf4j/pom.xml | 2 +-
.../org/apache/ignite/logger/slf4j/package.html | 3 +-
modules/spring/pom.xml | 2 +-
.../org/apache/ignite/cache/spring/package.html | 3 +-
.../internal/processors/resource/package.html | 2 +-
.../org/apache/ignite/spring/spring-caching.xml | 2 +-
.../ignite/spring/spring-dynamic-caching.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
.../ignite/tools/ant/beautifier/package.html | 2 +-
.../org/apache/ignite/util/antgar/package.html | 3 +-
modules/urideploy/pom.xml | 2 +-
.../ignite/spi/deployment/uri/package.html | 3 +-
.../deployment/uri/scanners/file/package.html | 2 +-
.../deployment/uri/scanners/ftp/package.html | 2 +-
.../deployment/uri/scanners/http/package.html | 3 +-
.../spi/deployment/uri/scanners/package.html | 2 +-
.../META-INF/bad-signed-deployfile-ignite.xml | 2 +-
.../spi/deployment/uri/META-INF/bad_classes.xml | 2 +-
.../META-INF/deploy-with-resources-ignite.xml | 2 +-
.../uri/META-INF/deploydepend-ignite.xml | 2 +-
.../uri/META-INF/deploydir-ignite.xml | 4 +-
.../uri/META-INF/deployfile-ignite.xml | 2 +-
.../spi/deployment/uri/META-INF/ignite.xml | 2 +-
.../spi/deployment/uri/META-INF/p2p-ignite.xml | 2 +-
.../META-INF/well-signed-deployfile-ignite.xml | 2 +-
.../ignite/spi/deployment/uri/package.html | 3 +-
.../deployment/uri/scanners/file/package.html | 2 +-
.../deployment/uri/scanners/ftp/package.html | 3 +-
.../deployment/uri/scanners/http/package.html | 3 +-
.../ignite/tools/gartask/META-INF/ignite.xml | 2 +-
.../java/org/apache/ignite/tools/package.html | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
.../org/apache/ignite/visor/plugin/package.html | 3 +-
modules/web/pom.xml | 2 +-
.../apache/ignite/cache/websession/package.html | 2 +-
.../apache/ignite/startup/servlet/package.html | 3 +-
modules/yardstick/pom.xml | 10 +
pom.xml | 72 +
589 files changed, 3393 insertions(+), 5917 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
index 43b35fe,6d429d8..511ae3d
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetIterationPreloadingSelfTest.java
@@@ -66,10 -68,10 +68,10 @@@ public class GridCacheEntrySetIteration
for (int i = 0; i < entryCnt; i++)
cache.put(String.valueOf(i), i);
- Collection<CacheEntry<String, Integer>> entries = new
ArrayList<>(10_000);
+ Collection<Entry<String, Integer>> entries = new
ArrayList<>(10_000);
for (int i = 0; i < 10_000; i++)
- entries.add(cache.randomEntry());
+ entries.add((CacheEntry<String, Integer>)cache.randomEntry());
startGrid(1);
startGrid(2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5c2f069/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIteratorsSelfTest.java
----------------------------------------------------------------------
