Merge branch 'sprint-1' into ignite-188
Conflicts:
modules/core/src/main/java/org/apache/ignite/IgniteJdbcDriver.java
modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
modules/core/src/main/java/org/apache/ignite/IgniteServices.java
modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
modules/core/src/main/java/org/apache/ignite/dataload/package.html
modules/core/src/main/java/org/apache/ignite/events/AuthenticationEvent.java
modules/core/src/main/java/org/apache/ignite/events/AuthorizationEvent.java
modules/core/src/main/java/org/apache/ignite/events/CacheEvent.java
modules/core/src/main/java/org/apache/ignite/events/CachePreloadingEvent.java
modules/core/src/main/java/org/apache/ignite/events/CheckpointEvent.java
modules/core/src/main/java/org/apache/ignite/events/DeploymentEvent.java
modules/core/src/main/java/org/apache/ignite/events/DiscoveryEvent.java
modules/core/src/main/java/org/apache/ignite/events/JobEvent.java
modules/core/src/main/java/org/apache/ignite/events/LicenseEvent.java
modules/core/src/main/java/org/apache/ignite/events/SecureSessionEvent.java
modules/core/src/main/java/org/apache/ignite/events/SwapSpaceEvent.java
modules/core/src/main/java/org/apache/ignite/events/TaskEvent.java
modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
modules/core/src/main/java/org/apache/ignite/jdbc/package.html
modules/core/src/main/java/org/apache/ignite/jdbc/typedef/package.html
modules/core/src/main/java/org/apache/ignite/jdbc/util/package.html
modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java
modules/core/src/main/java/org/apache/ignite/services/Service.java
modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java
modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAsyncOperationsLimitSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java
modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/GridSlf4jLogger.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/b08492a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b08492a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b08492a5
Branch: refs/heads/ignite-181
Commit: b08492a58b210f6f2817dd9a8d2a3a63ab4d77f1
Parents: 30901e8 d483cb6
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Fri Feb 6 22:59:06 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Fri Feb 6 22:59:06 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 | 48 +-
bin/ignite.sh | 30 +-
bin/igniterouter.bat | 30 +-
bin/igniterouter.sh | 32 +-
bin/ignitevisorcmd.bat | 52 +-
bin/ignitevisorcmd.sh | 30 +-
bin/include/functions.sh | 36 +-
bin/include/hadoop-classpath.bat | 26 +-
bin/include/hadoop-classpath.sh | 30 +-
bin/include/parseargs.bat | 32 +-
bin/include/parseargs.sh | 32 +-
bin/include/service.sh | 34 +-
bin/include/setenv.bat | 36 +-
bin/include/setenv.sh | 34 +-
bin/include/target-classpath.bat | 26 +-
bin/include/target-classpath.sh | 26 +-
bin/setup-hadoop.bat | 30 +-
bin/setup-hadoop.sh | 32 +-
config/default-config.xml | 2 +-
config/fabric/default-config.xml | 2 +-
config/hadoop/default-config.xml | 22 +-
config/ignite-log4j.xml | 2 +-
config/java.util.logging.properties | 2 +-
config/router/default-router.xml | 6 +-
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/computegrid/failover/package.html | 3 +-
.../computegrid/montecarlo/package.html | 2 +-
.../ignite/examples/computegrid/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 +-
.../ignite/examples/datastructures/package.html | 3 +-
.../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 | 10 +-
.../config/aop/jboss/jboss-gridgain-aop.xml | 38 -
.../GridifySetToXXXNonSpringAopSelfTest.java | 4 +-
.../GridifySetToXXXSpringAopSelfTest.java | 4 +-
.../ignite/gridify/NonSpringAopSelfTest.java | 6 +-
.../ignite/gridify/hierarchy/package.html | 4 +-
.../java/org/apache/ignite/gridify/package.html | 4 +-
.../testsuites/IgniteAopSelfTestSuite.java | 2 +-
.../loadtests/direct/singlesplit/package.html | 2 +-
.../gridify/GridifySingleSplitLoadTest.java | 2 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 4 +-
.../src/test/java/org/test/gridify/package.html | 3 +-
modules/aws/pom.xml | 3 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +-
.../ignite/spi/checkpoint/s3/package.html | 2 +-
.../spi/discovery/tcp/ipfinder/s3/package.html | 3 +-
.../ignite/spi/checkpoint/s3/package.html | 2 +-
.../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +-
.../spi/discovery/tcp/ipfinder/s3/package.html | 3 +-
.../config/grid-client-config.properties | 4 +-
.../config/grid-client-spring-config.xml | 6 +-
modules/clients/pom.xml | 2 +-
modules/clients/readme.md | 8 +-
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 +-
.../ClientAbstractMultiThreadedSelfTest.java | 2 +-
.../client/ClientDefaultCacheSelfTest.java | 6 +-
.../ignite/client/ClientSslNodeStartup.java | 2 +-
.../ignite/client/ClientStartNodeTask.java | 2 +-
.../ClientPropertiesConfigurationSelfTest.java | 4 +-
.../integration/ClientAbstractSelfTest.java | 12 +-
.../ClientTcpConnectivitySelfTest.java | 6 +-
.../ignite/client/integration/package.html | 2 +-
.../apache/ignite/client/router/package.html | 2 +-
.../rest/AbstractRestProcessorSelfTest.java | 12 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 68 +-
.../JettyRestProcessorAbstractSelfTest.java | 113 +-
.../rest/JettyRestProcessorSignedSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 2 +-
.../processors/rest/RestProcessorTest.java | 28 +-
.../protocols/tcp/TcpRestParserSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +-
.../ignite/jdbc/JdbcConnectionSelfTest.java | 2 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../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 | 14 +-
.../clients/src/test/resources/spring-cache.xml | 18 +-
.../src/test/resources/spring-router-ssl.xml | 8 +-
.../src/test/resources/spring-router.xml | 8 +-
.../src/test/resources/spring-server-node.xml | 12 +-
.../test/resources/spring-server-ssl-node.xml | 12 +-
modules/core/pom.xml | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 8 +-
.../java/org/apache/ignite/IgniteCache.java | 2 +
.../java/org/apache/ignite/IgniteCluster.java | 14 +-
.../java/org/apache/ignite/IgniteCompute.java | 16 +-
.../org/apache/ignite/IgniteDataLoader.java | 4 +-
.../java/org/apache/ignite/IgniteEvents.java | 10 +-
.../main/java/org/apache/ignite/IgniteFs.java | 4 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 30 +-
.../java/org/apache/ignite/IgniteLogger.java | 14 +-
.../java/org/apache/ignite/IgniteMessaging.java | 4 +-
.../java/org/apache/ignite/IgnitePortables.java | 36 +-
.../java/org/apache/ignite/IgniteScheduler.java | 6 +-
.../java/org/apache/ignite/IgniteServices.java | 34 +-
.../java/org/apache/ignite/IgniteState.java | 2 +-
.../main/java/org/apache/ignite/Ignition.java | 20 +-
.../apache/ignite/cache/CacheProjection.java | 2 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../cache/affinity/consistenthash/package.html | 2 +-
.../ignite/cache/affinity/fair/package.html | 2 +-
.../apache/ignite/cache/affinity/package.html | 2 +-
.../CacheRendezvousAffinityFunction.java | 2 +-
.../cache/affinity/rendezvous/package.html | 3 +-
.../org/apache/ignite/cache/cloner/package.html | 2 +-
.../cache/eviction/CacheEvictionPolicy.java | 6 +-
.../ignite/cache/eviction/fifo/package.html | 3 +-
.../ignite/cache/eviction/ignitefs/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 +-
.../apache/ignite/cache/query/CacheQueries.java | 2 +-
.../apache/ignite/cache/query/CacheQuery.java | 14 +-
.../ignite/cache/query/CacheQuerySqlField.java | 2 +-
.../cache/query/annotations/QuerySqlField.java | 2 +-
.../org/apache/ignite/cache/query/package.html | 3 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 6 +-
.../cache/store/jdbc/dialect/package.html | 2 +-
.../apache/ignite/cache/store/jdbc/package.html | 2 +-
.../org/apache/ignite/cache/store/package.html | 3 +-
.../org/apache/ignite/client/GridClient.java | 4 +-
.../apache/ignite/client/GridClientCompute.java | 6 +-
.../ignite/client/GridClientConfiguration.java | 4 +-
.../apache/ignite/client/GridClientData.java | 2 +-
.../apache/ignite/client/balancer/package.html | 2 +-
.../client/impl/GridClientComputeImpl.java | 2 +-
.../ignite/client/impl/GridClientImpl.java | 2 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../impl/connection/GridClientTopology.java | 2 +-
.../org/apache/ignite/client/impl/package.html | 5 +-
.../ignite/client/marshaller/jdk/package.html | 2 +-
.../client/marshaller/optimized/package.html | 4 +-
.../ignite/client/marshaller/package.html | 3 +-
.../java/org/apache/ignite/client/package.html | 3 +-
.../impl/GridRouterCommandLineStartup.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 2 +-
.../ignite/client/router/impl/package.html | 3 +-
.../apache/ignite/client/router/package.html | 3 +-
.../org/apache/ignite/client/ssl/package.html | 4 +-
.../org/apache/ignite/client/util/package.html | 2 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 4 +-
.../org/apache/ignite/cluster/ClusterNode.java | 27 +-
.../org/apache/ignite/compute/ComputeJob.java | 4 +-
.../ignite/compute/ComputeJobAdapter.java | 2 +-
.../ignite/compute/ComputeJobContext.java | 2 +-
.../compute/ComputeJobContinuationAdapter.java | 2 +-
.../org/apache/ignite/compute/ComputeTask.java | 2 +-
.../ignite/compute/ComputeTaskMapAsync.java | 2 +-
.../apache/ignite/compute/ComputeTaskName.java | 2 +-
.../ignite/compute/ComputeTaskSession.java | 3 -
.../apache/ignite/compute/ComputeTaskSpis.java | 2 +-
.../apache/ignite/compute/gridify/Gridify.java | 10 +-
.../ignite/compute/gridify/GridifyInput.java | 2 +-
.../ignite/compute/gridify/GridifySetToSet.java | 16 +-
.../compute/gridify/GridifySetToValue.java | 16 +-
.../ignite/compute/gridify/aop/package.html | 3 +-
.../apache/ignite/compute/gridify/package.html | 3 +-
.../java/org/apache/ignite/compute/package.html | 2 +-
.../ignite/configuration/AddressResolver.java | 2 +-
.../ClientConnectionConfiguration.java | 8 +-
.../ignite/configuration/DeploymentMode.java | 20 +-
.../configuration/IgniteConfiguration.java | 110 +-
.../configuration/IgniteFsConfiguration.java | 12 +-
.../configuration/QueryConfiguration.java | 8 +-
.../org/apache/ignite/dataload/package.html | 24 +
.../ignite/events/AuthenticationEvent.java | 8 +-
.../ignite/events/AuthorizationEvent.java | 6 +-
.../org/apache/ignite/events/CacheEvent.java | 10 +-
.../ignite/events/CachePreloadingEvent.java | 12 +-
.../ignite/events/CacheQueryExecutedEvent.java | 12 +-
.../ignite/events/CacheQueryReadEvent.java | 12 +-
.../apache/ignite/events/CheckpointEvent.java | 10 +-
.../apache/ignite/events/DeploymentEvent.java | 10 +-
.../apache/ignite/events/DiscoveryEvent.java | 12 +-
.../java/org/apache/ignite/events/Event.java | 16 +-
.../org/apache/ignite/events/EventType.java | 176 +-
.../org/apache/ignite/events/IgniteFsEvent.java | 12 +-
.../java/org/apache/ignite/events/JobEvent.java | 10 +-
.../org/apache/ignite/events/LicenseEvent.java | 12 +-
.../ignite/events/SecureSessionEvent.java | 12 +-
.../apache/ignite/events/SwapSpaceEvent.java | 12 +-
.../org/apache/ignite/events/TaskEvent.java | 16 +-
.../java/org/apache/ignite/events/package.html | 5 +-
.../IgniteFsGroupDataBlocksKeyMapper.java | 2 +-
.../IgniteFsInvalidHdfsVersionException.java | 4 +-
.../ignite/ignitefs/mapreduce/package.html | 3 +-
.../ignitefs/mapreduce/records/package.html | 2 +-
.../org/apache/ignite/ignitefs/package.html | 2 +-
.../ignite/internal/ClusterGroupAdapter.java | 2 +-
.../apache/ignite/internal/GridComponent.java | 2 +-
.../apache/ignite/internal/GridDiagnostic.java | 2 +-
.../ignite/internal/GridKernalContext.java | 4 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../apache/ignite/internal/GridKillTask.java | 2 +-
.../ignite/internal/GridNodeAttributes.java | 141 -
.../apache/ignite/internal/GridProperties.java | 2 +-
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../ignite/internal/IgniteComponentType.java | 2 +-
.../ignite/internal/IgniteEventsImpl.java | 2 +-
.../org/apache/ignite/internal/IgniteEx.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 50 +-
.../ignite/internal/IgniteNodeAttributes.java | 141 +
.../org/apache/ignite/internal/IgnitionEx.java | 40 +-
.../ignite/internal/executor/package.html | 3 +-
.../internal/fs/common/GridGgfsMessage.java | 2 +-
.../ignite/internal/fs/common/package.html | 3 +-
.../ignite/internal/jdbc/JdbcConnection.java | 8 +-
.../internal/jdbc/JdbcDatabaseMetadata.java | 6 +-
.../ignite/internal/jdbc/JdbcResultSet.java | 2 +-
.../ignite/internal/jdbc/JdbcStatement.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../internal/managers/checkpoint/package.html | 3 +-
.../internal/managers/collision/package.html | 3 +-
.../managers/communication/GridIoManager.java | 2 +-
.../managers/communication/package.html | 3 +-
.../internal/managers/deployment/package.html | 3 +-
.../deployment/protocol/gg/package.html | 3 +-
.../discovery/GridDiscoveryManager.java | 4 +-
.../internal/managers/discovery/package.html | 3 +-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../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 +-
.../managers/security/GridSecurityContext.java | 6 +-
.../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/GridCacheAttributes.java | 6 +-
.../processors/cache/GridCacheUtils.java | 21 +-
.../processors/cache/IgniteCacheProxy.java | 4 +
.../cache/query/GridCacheSqlIndexMetadata.java | 2 +-
.../cache/query/GridCacheSqlMetadata.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 +-
.../internal/processors/fs/GridGgfsContext.java | 2 +-
.../internal/processors/fs/GridGgfsImpl.java | 2 +-
.../processors/fs/IgniteFsProcessor.java | 4 +-
.../ignite/internal/processors/fs/package.html | 3 +-
.../internal/processors/hadoop/GridHadoop.java | 2 +-
.../processors/hadoop/GridHadoopJob.java | 4 +-
.../hadoop/GridHadoopJobProperty.java | 4 +-
.../internal/processors/hadoop/package.html | 2 +-
.../ignite/internal/processors/job/package.html | 3 +-
.../internal/processors/jobmetrics/package.html | 2 +-
.../license/GridLicenseProcessor.java | 2 +-
.../license/GridLicenseSubsystem.java | 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 +-
.../resource/GridSpringResourceContext.java | 2 +-
.../internal/processors/resource/package.html | 3 +-
.../processors/rest/GridRestProcessor.java | 2 +-
.../processors/rest/client/message/package.html | 5 +-
.../processors/rest/handlers/cache/package.html | 3 +-
.../handlers/log/GridLogCommandHandler.java | 4 +-
.../processors/rest/handlers/log/package.html | 3 +-
.../processors/rest/handlers/package.html | 3 +-
.../top/GridTopologyCommandHandler.java | 4 +-
.../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 +-
.../protocols/tcp/GridClientPacketType.java | 4 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 6 +-
.../processors/rest/protocols/tcp/package.html | 3 +-
.../processors/rest/request/package.html | 3 +-
.../schedule/IgniteNoopScheduleProcessor.java | 4 +-
.../internal/processors/schedule/package.html | 2 +-
.../processors/segmentation/package.html | 3 +-
.../internal/processors/session/package.html | 3 +-
.../spring/IgniteSpringProcessor.java | 4 +-
.../streamer/GridStreamProcessor.java | 2 +-
.../internal/processors/streamer/package.html | 3 +-
.../internal/processors/task/package.html | 3 +-
.../internal/processors/timeout/package.html | 3 +-
.../ignite/internal/product/IgniteProduct.java | 6 +-
.../internal/product/IgniteProductLicense.java | 4 +-
.../apache/ignite/internal/product/package.html | 3 +-
.../internal/util/GridConfigurationFinder.java | 12 +-
.../ignite/internal/util/IgniteUtils.java | 82 +-
.../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/lang/GridFunc.java | 2 +-
.../internal/util/lang/GridPeerDeployAware.java | 2 +-
.../util/lang/GridPeerDeployAwareAdapter.java | 2 +-
.../nio/GridConnectionBytesVerifyFilter.java | 2 +-
.../ignite/internal/util/nio/package.html | 3 +-
.../ignite/internal/util/nio/ssl/package.html | 3 +-
.../apache/ignite/internal/util/package.html | 2 +-
.../util/portscanner/GridJmxPortFinder.java | 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 +-
.../apache/ignite/internal/util/typedef/X.java | 8 +-
.../internal/util/typedef/internal/package.html | 3 +-
.../ignite/internal/util/typedef/package.html | 3 +-
.../ignite/internal/util/worker/package.html | 2 +-
.../visor/cache/VisorCacheConfiguration.java | 6 +-
.../internal/visor/file/VisorFileBlockTask.java | 2 +-
.../visor/file/VisorLatestTextFilesTask.java | 2 +-
.../internal/visor/log/VisorLogSearchTask.java | 2 +-
.../visor/node/VisorBasicConfiguration.java | 2 +-
.../node/VisorExecutorServiceConfiguration.java | 18 +-
.../streamer/VisorStreamerConfiguration.java | 6 +-
.../internal/visor/util/VisorTaskUtils.java | 2 +-
.../java/org/apache/ignite/interop/package.html | 22 +-
.../java/org/apache/ignite/jdbc/package.html | 24 +
.../org/apache/ignite/jdbc/typedef/package.html | 24 +
.../org/apache/ignite/jdbc/util/package.html | 24 +
.../org/apache/ignite/lang/IgniteClosure.java | 2 +-
.../org/apache/ignite/lang/IgnitePredicate.java | 2 +-
.../java/org/apache/ignite/lang/package.html | 3 +-
.../apache/ignite/lifecycle/LifecycleAware.java | 2 +-
.../apache/ignite/lifecycle/LifecycleBean.java | 4 +-
.../apache/ignite/logger/LoggerNodeIdAware.java | 2 +-
.../apache/ignite/logger/java/JavaLogger.java | 12 +-
.../org/apache/ignite/logger/java/package.html | 3 +-
.../java/org/apache/ignite/logger/package.html | 3 +-
.../apache/ignite/marshaller/Marshaller.java | 4 +-
.../ignite/marshaller/MarshallerExclusions.java | 6 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 2 +-
.../apache/ignite/marshaller/jdk/package.html | 2 +-
.../optimized/OptimizedClassResolver.java | 2 +-
.../optimized/OptimizedMarshallable.java | 2 +-
.../optimized/OptimizedMarshaller.java | 4 +-
.../optimized/OptimizedObjectInputStream.java | 2 +-
.../optimized/OptimizedObjectOutputStream.java | 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 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 18 +-
.../java/org/apache/ignite/mxbean/package.html | 3 +-
.../main/java/org/apache/ignite/package.html | 3 +-
.../ignite/plugin/security/GridSecurity.java | 6 +-
.../security/GridSecurityCredentials.java | 2 +-
.../GridSecurityCredentialsProvider.java | 2 +-
.../apache/ignite/plugin/security/package.html | 3 +-
.../segmentation/GridSegmentationPolicy.java | 2 +-
.../segmentation/GridSegmentationResolver.java | 2 +-
.../ignite/plugin/segmentation/package.html | 2 +-
.../ignite/portables/PortableBuilder.java | 4 +-
.../ignite/portables/PortableConfiguration.java | 2 +-
.../ignite/portables/PortableIdMapper.java | 4 +-
.../ignite/portables/PortableMarshalAware.java | 2 +-
.../apache/ignite/portables/PortableObject.java | 16 +-
.../apache/ignite/portables/PortableReader.java | 6 +-
.../apache/ignite/portables/PortableWriter.java | 6 +-
.../org/apache/ignite/portables/package.html | 3 +-
.../ignite/resources/ServiceResource.java | 2 +-
.../SpringApplicationContextResource.java | 2 +-
.../org/apache/ignite/resources/package.html | 3 +-
.../org/apache/ignite/scheduler/package.html | 3 +-
.../org/apache/ignite/services/Service.java | 14 +-
.../ignite/services/ServiceConfiguration.java | 2 +-
.../org/apache/ignite/services/package.html | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 6 +-
.../ignite/spi/IgniteSpiConfiguration.java | 2 +-
.../ignite/spi/IgniteSpiManagementMBean.java | 6 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 2 +-
.../spi/authentication/AuthenticationSpi.java | 6 +-
.../noop/NoopAuthenticationSpi.java | 6 +-
.../ignite/spi/authentication/noop/package.html | 3 +-
.../ignite/spi/authentication/package.html | 3 +-
.../ignite/spi/checkpoint/CheckpointSpi.java | 4 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 6 +-
.../ignite/spi/checkpoint/cache/package.html | 3 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 4 +-
.../ignite/spi/checkpoint/jdbc/package.html | 3 +-
.../ignite/spi/checkpoint/noop/package.html | 3 +-
.../apache/ignite/spi/checkpoint/package.html | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 6 +-
.../ignite/spi/checkpoint/sharedfs/package.html | 3 +-
.../ignite/spi/collision/CollisionSpi.java | 6 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 4 +-
.../ignite/spi/collision/fifoqueue/package.html | 3 +-
.../jobstealing/JobStealingCollisionSpi.java | 2 +-
.../spi/collision/jobstealing/package.html | 3 +-
.../ignite/spi/collision/noop/package.html | 3 +-
.../apache/ignite/spi/collision/package.html | 3 +-
.../PriorityQueueCollisionSpi.java | 2 +-
.../spi/collision/priorityqueue/package.html | 3 +-
.../spi/communication/CommunicationSpi.java | 6 +-
.../ignite/spi/communication/package.html | 3 +-
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../ignite/spi/communication/tcp/package.html | 3 +-
.../ignite/spi/deployment/DeploymentSpi.java | 4 +-
.../ignite/spi/deployment/local/package.html | 3 +-
.../apache/ignite/spi/deployment/package.html | 3 +-
.../spi/discovery/DiscoveryMetricsProvider.java | 2 +-
.../ignite/spi/discovery/DiscoverySpi.java | 8 +-
.../spi/discovery/DiscoverySpiDataExchange.java | 2 +-
.../apache/ignite/spi/discovery/package.html | 3 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 28 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../tcp/internal/TcpDiscoveryNode.java | 6 +-
.../spi/discovery/tcp/internal/package.html | 3 +-
.../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 6 +-
.../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 +-
.../spi/eventstorage/EventStorageSpi.java | 4 +-
.../memory/MemoryEventStorageSpi.java | 4 +-
.../ignite/spi/eventstorage/memory/package.html | 2 +-
.../apache/ignite/spi/eventstorage/package.html | 2 +-
.../apache/ignite/spi/failover/FailoverSpi.java | 4 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 2 +-
.../ignite/spi/failover/always/package.html | 3 +-
.../jobstealing/JobStealingFailoverSpi.java | 14 +-
.../spi/failover/jobstealing/package.html | 2 +-
.../spi/failover/never/NeverFailoverSpi.java | 2 +-
.../ignite/spi/failover/never/package.html | 3 +-
.../org/apache/ignite/spi/failover/package.html | 2 +-
.../ignite/spi/indexing/GridIndexingSpi.java | 2 +-
.../org/apache/ignite/spi/indexing/package.html | 3 +-
.../spi/loadbalancing/LoadBalancingSpi.java | 4 +-
.../adaptive/AdaptiveCpuLoadProbe.java | 6 +-
.../adaptive/AdaptiveJobCountLoadProbe.java | 6 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-
.../adaptive/AdaptiveLoadProbe.java | 2 +-
.../AdaptiveProcessingTimeLoadProbe.java | 6 +-
.../spi/loadbalancing/adaptive/package.html | 2 +-
.../ignite/spi/loadbalancing/package.html | 3 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../spi/loadbalancing/roundrobin/package.html | 3 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../loadbalancing/weightedrandom/package.html | 2 +-
.../java/org/apache/ignite/spi/package.html | 2 +-
.../spi/securesession/SecureSessionSpi.java | 6 +-
.../noop/NoopSecureSessionSpi.java | 6 +-
.../ignite/spi/securesession/noop/package.html | 3 +-
.../ignite/spi/securesession/package.html | 2 +-
.../ignite/spi/swapspace/SwapSpaceSpi.java | 6 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../ignite/spi/swapspace/file/package.html | 3 +-
.../ignite/spi/swapspace/noop/package.html | 3 +-
.../apache/ignite/spi/swapspace/package.html | 3 +-
.../ignite/startup/cmdline/AboutDialog.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 10 +-
.../startup/cmdline/CommandLineTransformer.java | 4 +-
.../apache/ignite/startup/cmdline/package.html | 3 +-
.../org/apache/ignite/startup/package-info.java | 2 +-
.../ignite/streamer/StreamerConfiguration.java | 10 +-
.../apache/ignite/streamer/StreamerWindow.java | 2 +-
.../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 +-
.../org/apache/ignite/thread/IgniteThread.java | 2 +-
.../java/org/apache/ignite/thread/package.html | 3 +-
.../apache/ignite/transactions/IgniteTx.java | 4 +-
.../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 | 10 +-
.../spring-cache-client-benchmark-2.xml | 10 +-
.../spring-cache-client-benchmark-3.xml | 10 +-
.../test/config/default-spring-url-testing.xml | 4 +-
.../core/src/test/config/discovery-stress.xml | 2 +-
modules/core/src/test/config/example-cache.xml | 4 +-
modules/core/src/test/config/ggfs-loopback.xml | 2 +-
modules/core/src/test/config/ggfs-shmem.xml | 10 +-
.../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 | 4 +-
.../test/config/load/cache-client-benchmark.xml | 4 +-
.../config/load/dsi-49-server-production.xml | 5 +-
.../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 | 10 +-
.../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 | 10 +-
.../core/src/test/config/spring-cache-load.xml | 10 +-
.../config/spring-cache-put-remove-load.xml | 4 +-
.../core/src/test/config/spring-cache-swap.xml | 4 +-
.../src/test/config/spring-cache-teststore.xml | 6 +-
.../core/src/test/config/spring-multicache.xml | 10 +-
.../src/test/config/spring-start-nodes-attr.xml | 4 +-
.../core/src/test/config/spring-start-nodes.xml | 4 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 26 +-
.../average/spring-streamer-average-base.xml | 10 +-
.../average/spring-streamer-average-local.xml | 10 +-
.../average/spring-streamer-average-random.xml | 10 +-
.../config/streamer/spring-streamer-base.xml | 10 +-
.../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/GridAffinityP2PSelfTest.java | 4 +-
.../internal/GridCacheProjectionRemoveTest.java | 6 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 2 +-
.../ignite/internal/GridHomePathSelfTest.java | 4 +-
.../GridNodeVisorAttributesSelfTest.java | 4 +-
.../internal/GridReleaseTypeSelfTest.java | 4 +-
.../apache/ignite/internal/GridStartupMain.java | 8 +-
.../apache/ignite/internal/GridStartupTest.java | 8 +-
.../GridTaskCancelSingleNodeSelfTest.java | 2 -
.../GridTopologyBuildVersionSelfTest.java | 8 +-
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
.../internal/managers/checkpoint/package.html | 3 +-
.../communication/GridIoManagerSelfTest.java | 4 +-
.../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 | 2480 ++++--------------
.../GridCacheAbstractIteratorsSelfTest.java | 237 +-
.../GridCacheAbstractProjectionSelfTest.java | 855 ------
.../cache/GridCacheAbstractSelfTest.java | 36 +-
.../cache/GridCacheAffinityApiSelfTest.java | 42 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 11 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 115 +-
...acheBasicStoreMultithreadedAbstractTest.java | 5 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 8 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 2 +-
...idCacheGetAndTransformStoreAbstractTest.java | 6 +-
.../GridCacheMissingCommitVersionSelfTest.java | 12 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 2 +-
.../cache/GridCachePartitionedWritesTest.java | 11 +-
.../GridCacheQueryInternalKeysSelfTest.java | 2 +-
.../cache/GridCacheStorePutxSelfTest.java | 17 +-
.../cache/GridCacheSwapReloadSelfTest.java | 25 +-
...idCacheValueConsistencyAbstractSelfTest.java | 34 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 69 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 4 +-
.../GridCacheMultiNodeDataStructureTest.java | 2 +-
.../GridCacheQueueCleanupSelfTest.java | 2 +-
...acheEntrySetIterationPreloadingSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 14 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 2 +-
.../dht/GridCacheColocatedDebugTest.java | 28 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 3 -
.../GridCacheDhtPreloadMessageCountTest.java | 4 -
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 -
...dCachePartitionedOnlyProjectionSelfTest.java | 32 -
...unctionExcludeNeighborsAbstractSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 324 +--
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 71 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 132 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 152 +-
.../near/GridCacheNearOneNodeSelfTest.java | 44 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 217 +-
.../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 | 208 +-
.../GridCachePartitionedProjectionSelfTest.java | 156 --
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 17 +-
.../GridCacheReplicatedProjectionSelfTest.java | 66 -
.../GridCacheDistributedEvictionsSelfTest.java | 2 -
.../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 +-
.../continuous/GridEventConsumeSelfTest.java | 4 +-
.../GridDataLoaderProcessorSelfTest.java | 2 +-
.../ignite/internal/processors/fs/package.html | 3 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 4 +-
.../apache/ignite/internal/updatestatus.html | 7 +-
...artupWithSpecifiedWorkDirectorySelfTest.java | 8 +-
...tartupWithUndefinedGridGainHomeSelfTest.java | 106 -
...dStartupWithUndefinedIgniteHomeSelfTest.java | 106 +
.../internal/util/IgniteUtilsSelfTest.java | 6 +-
.../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../ignite/internal/util/nio/package.html | 3 +-
.../ignite/internal/util/tostring/package.html | 3 +-
.../jvmtest/ServerSocketMultiThreadedTest.java | 4 +-
.../apache/ignite/lang/GridFuncSelfTest.java | 4 +-
.../java/org/apache/ignite/lang/package.html | 3 +-
.../org/apache/ignite/lang/utils/package.html | 2 +-
.../loadtest/GridSingleExecutionTest.java | 6 +-
.../org/apache/ignite/loadtest/package.html | 3 +-
.../cache/GridCacheAbstractLoadTest.java | 10 +-
.../loadtests/cache/GridCacheBenchmark.java | 8 +-
.../cache/GridCacheGroupLockComparisonTest.java | 12 +-
.../GridCacheWriteBehindStoreLoadTest.java | 19 +-
.../capacity/spring-capacity-cache.xml | 10 +-
.../colocation/GridTestLifecycleBean.java | 3 +-
.../loadtests/colocation/spring-colocation.xml | 10 +-
.../communication/GridIoManagerBenchmark.java | 2 +-
.../GridTcpCommunicationBenchmark.java | 12 +-
.../loadtests/direct/multisplit/package.html | 2 +-
.../loadtests/direct/newnodes/package.html | 2 +-
.../GridSingleSplitsRedeployLoadTest.java | 2 +-
.../loadtests/direct/redeploy/package.html | 2 +-
.../loadtests/direct/session/package.html | 2 +-
.../loadtests/direct/stealing/package.html | 2 +-
.../loadtests/discovery/GridGcTimeoutTest.java | 2 +-
.../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +-
.../apache/ignite/loadtests/dsi/package.html | 3 +-
.../ignite/loadtests/job/GridJobLoadTest.java | 4 +-
.../apache/ignite/loadtests/job/package.html | 3 +-
.../loadtests/mapper/GridNodeStartup.java | 8 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
.../streamer/GridStreamerBenchmark.java | 2 +-
.../ignite/logger/java/GridJavaLoggerTest.java | 65 -
.../logger/java/IgniteJavaLoggerTest.java | 65 +
.../org/apache/ignite/logger/java/package.html | 3 +-
.../apache/ignite/marshaller/jdk/package.html | 3 +-
.../GridOptimizedMarshallerEnumSelfTest.java | 62 -
.../GridOptimizedMarshallerSelfTest.java | 452 ----
.../optimized/GridOptimizedMarshallerTest.java | 830 ------
.../GridOptimizedObjectStreamSelfTest.java | 2093 ---------------
.../GridTestTcpDiscoveryIpFinderAdapter.java | 44 -
.../OptimizedMarshallerEnumSelfTest.java | 62 +
.../optimized/OptimizedMarshallerSelfTest.java | 452 ++++
.../optimized/OptimizedMarshallerTest.java | 830 ++++++
.../OptimizedObjectStreamSelfTest.java | 2093 +++++++++++++++
.../TestTcpDiscoveryIpFinderAdapter.java | 44 +
.../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 +-
.../cache/CacheCheckpointSpiConfigSelfTest.java | 34 +
.../CacheCheckpointSpiSecondCacheSelfTest.java | 106 +
.../cache/CacheCheckpointSpiSelfTest.java | 29 +
.../CacheCheckpointSpiStartStopSelfTest.java | 34 +
.../GridCacheCheckpointSpiConfigSelfTest.java | 34 -
...idCacheCheckpointSpiSecondCacheSelfTest.java | 106 -
.../cache/GridCacheCheckpointSpiSelfTest.java | 29 -
...GridCacheCheckpointSpiStartStopSelfTest.java | 34 -
.../ignite/spi/checkpoint/cache/package.html | 2 +-
.../GridJdbcCheckpointSpiConfigSelfTest.java | 77 -
...idJdbcCheckpointSpiCustomConfigSelfTest.java | 47 -
...dJdbcCheckpointSpiDefaultConfigSelfTest.java | 45 -
.../GridJdbcCheckpointSpiStartStopSelfTest.java | 47 -
.../jdbc/JdbcCheckpointSpiConfigSelfTest.java | 77 +
.../JdbcCheckpointSpiCustomConfigSelfTest.java | 47 +
.../JdbcCheckpointSpiDefaultConfigSelfTest.java | 45 +
.../JdbcCheckpointSpiStartStopSelfTest.java | 47 +
.../ignite/spi/checkpoint/jdbc/package.html | 2 +-
.../apache/ignite/spi/checkpoint/package.html | 2 +-
...redFsCheckpointSpiMultiThreadedSelfTest.java | 2 +-
.../ignite/spi/checkpoint/sharedfs/package.html | 3 +-
.../ignite/spi/collision/fifoqueue/package.html | 3 +-
...bStealingCollisionSpiAttributesSelfTest.java | 2 +-
...alingCollisionSpiCustomTopologySelfTest.java | 2 +-
.../GridJobStealingCollisionSpiSelfTest.java | 2 +-
...obStealingCollisionSpiStartStopSelfTest.java | 2 +-
.../spi/collision/jobstealing/package.html | 3 +-
.../apache/ignite/spi/collision/package.html | 3 +-
.../spi/collision/priorityqueue/package.html | 3 +-
.../GridAbstractCommunicationSelfTest.java | 4 +-
.../ignite/spi/communication/package.html | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 4 +-
.../ignite/spi/communication/tcp/package.html | 3 +-
.../ignite/spi/deployment/local/package.html | 3 +-
.../AbstractDiscoveryRandomStartStopTest.java | 213 ++
.../discovery/AbstractDiscoverySelfTest.java | 496 ++++
.../spi/discovery/AbstractDiscoveryTest.java | 153 ++
...ridAbstractDiscoveryRandomStartStopTest.java | 213 --
.../GridAbstractDiscoverySelfTest.java | 496 ----
.../discovery/GridAbstractDiscoveryTest.java | 153 --
.../apache/ignite/spi/discovery/package.html | 3 +-
.../tcp/GridTcpClientDiscoverySelfTest.java | 691 -----
.../GridTcpDiscoveryConcurrentStartTest.java | 118 -
...GridTcpDiscoveryMarshallerCheckSelfTest.java | 102 -
.../tcp/GridTcpDiscoveryMultiThreadedTest.java | 206 --
.../discovery/tcp/GridTcpDiscoverySelfTest.java | 990 -------
.../GridTcpDiscoverySnapshotHistoryTest.java | 174 --
.../tcp/GridTcpDiscoverySpiConfigSelfTest.java | 45 -
.../GridTcpDiscoverySpiRandomStartStopTest.java | 45 -
.../tcp/GridTcpDiscoverySpiSelfTest.java | 43 -
.../GridTcpDiscoverySpiStartStopSelfTest.java | 82 -
.../GridTcpDiscoverySpiWildcardSelfTest.java | 63 -
.../tcp/TcpClientDiscoverySelfTest.java | 691 +++++
.../tcp/TcpDiscoveryConcurrentStartTest.java | 118 +
.../TcpDiscoveryMarshallerCheckSelfTest.java | 102 +
.../tcp/TcpDiscoveryMultiThreadedTest.java | 206 ++
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 990 +++++++
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 174 ++
.../tcp/TcpDiscoverySpiConfigSelfTest.java | 45 +
.../tcp/TcpDiscoverySpiRandomStartStopTest.java | 45 +
.../discovery/tcp/TcpDiscoverySpiSelfTest.java | 43 +
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 82 +
.../tcp/TcpDiscoverySpiWildcardSelfTest.java | 63 +
...ridTcpDiscoveryIpFinderAbstractSelfTest.java | 125 -
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 125 +
.../GridTcpDiscoveryJdbcIpFinderSelfTest.java | 90 -
.../jdbc/TcpDiscoveryJdbcIpFinderSelfTest.java | 90 +
.../discovery/tcp/ipfinder/jdbc/package.html | 3 +-
...idTcpDiscoveryMulticastIpFinderSelfTest.java | 115 -
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 115 +
.../spi/discovery/tcp/ipfinder/package.html | 2 +-
...ridTcpDiscoverySharedFsIpFinderSelfTest.java | 56 -
.../TcpDiscoverySharedFsIpFinderSelfTest.java | 56 +
.../tcp/ipfinder/sharedfs/package.html | 3 +-
.../vm/GridTcpDiscoveryVmIpFinderSelfTest.java | 193 --
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 193 ++
.../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 +-
...idJobStealingFailoverSpiOneNodeSelfTest.java | 4 +-
.../GridJobStealingFailoverSpiSelfTest.java | 2 +-
...JobStealingFailoverSpiStartStopSelfTest.java | 2 +-
.../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 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../apache/ignite/spi/swapspace/package.html | 3 +-
.../startup/GridRandomCommandLineLoader.java | 10 +-
.../ignite/startup/GridVmNodesStarter.java | 2 +-
.../cmdline/GridCommandLineLoaderTest.java | 2 +-
.../GridCommandLineTransformerSelfTest.java | 4 +-
.../apache/ignite/startup/cmdline/package.html | 3 +-
.../java/org/apache/ignite/startup/package.html | 3 +-
.../startup/servlet/GridServletLoaderTest.java | 12 +-
.../apache/ignite/startup/servlet/package.html | 3 +-
.../ignite/testframework/GridTestNode.java | 4 +-
.../ignite/testframework/GridTestUtils.java | 36 +-
.../config/GridTestProperties.java | 2 +-
.../ignite/testframework/config/package.html | 3 +-
.../ignite/testframework/http/package.html | 3 +-
.../testframework/junits/GridAbstractTest.java | 19 +-
.../ignite/testframework/junits/IgniteMock.java | 24 +-
.../junits/IgniteTestResources.java | 10 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 56 +-
.../testframework/junits/common/package.html | 3 +-
.../junits/logger/GridTestLog4jLogger.java | 12 +-
.../ignite/testframework/junits/package.html | 2 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../testframework/junits/spi/package.html | 3 +-
.../apache/ignite/testframework/package.html | 3 +-
.../IgniteCacheDataStructuresSelfTestSuite.java | 2 +-
.../IgniteCacheFailoverTestSuite.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 5 -
.../IgniteCacheWriteBehindTestSuite.java | 2 +-
.../IgniteContinuousTaskSelfTestSuite.java | 2 +-
.../ignite/testsuites/IgniteFsTestSuite.java | 2 +-
.../IgniteJobMetricsSelfTestSuite.java | 2 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +-
.../testsuites/IgniteLangSelfTestSuite.java | 2 +-
.../testsuites/IgniteLoggingSelfTestSuite.java | 2 +-
.../IgniteMarshallerSelfTestSuite.java | 8 +-
.../IgniteSpiCheckpointSelfTestSuite.java | 16 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 20 +-
.../IgniteSpiEventStorageSelfTestSuite.java | 2 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +-
.../org/apache/ignite/testsuites/package.html | 2 +-
.../util/GridConcurrentLinkedDequeSelfTest.java | 2 -
.../util/GridTopologyHeapSizeSelfTest.java | 2 +-
.../java/org/apache/ignite/util/package.html | 2 +-
.../src/test/resources/load/html/index.html | 43 +-
.../core/src/test/webapp/META-INF/gg-config.xml | 20 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 6 +-
modules/email/pom.xml | 2 +-
modules/extdata/p2p/META-INF/gridgain.xml | 40 -
modules/extdata/p2p/META-INF/ignite.xml | 40 +
modules/extdata/p2p/pom.xml | 2 +-
.../org/apache/ignite/tests/p2p/package.html | 3 +-
modules/extdata/uri/pom.xml | 2 +-
.../uri/tasks/GridUriDeploymentDependency1.java | 2 +-
.../uri/tasks/GridUriDeploymentDependency2.java | 2 +-
.../uri/tasks/GridUriDeploymentTestTask2.java | 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 +-
.../client/hadoop/GridHadoopClientProtocol.java | 4 +-
.../GridHadoopClientProtocolProvider.java | 6 +-
.../apache/ignite/client/hadoop/package.html | 5 +-
.../hadoop/GridGgfsHadoopParameters.java | 2 +-
.../apache/ignite/ignitefs/hadoop/package.html | 3 +-
.../hadoop/v1/GridGgfsHadoopFileSystem.java | 12 +-
.../ignite/ignitefs/hadoop/v1/package.html | 5 +-
.../hadoop/v2/GridGgfsHadoopFileSystem.java | 12 +-
.../ignite/ignitefs/hadoop/v2/package.html | 5 +-
.../org/apache/ignite/ignitefs/package.html | 3 +-
.../hadoop/GridGgfsHadoopFileSystemWrapper.java | 2 +-
.../ignite/internal/fs/hadoop/package.html | 3 +-
.../org/apache/ignite/internal/fs/package.html | 3 +-
.../hadoop/GridHadoopClassLoader.java | 2 +-
.../processors/hadoop/GridHadoopSetup.java | 56 +-
.../GridHadoopExternalTaskExecutor.java | 2 +-
.../child/GridHadoopExternalProcessStarter.java | 4 +-
.../ignite/ignitefs/GridFileSystemLoad.java | 4 +-
...dGgfsHadoop20FileSystemAbstractSelfTest.java | 2 +-
.../GridGgfsHadoopDualAbstractSelfTest.java | 2 +-
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 6 +-
...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +-
.../GridGgfsHadoopFileSystemLoggerSelfTest.java | 2 +-
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 6 +-
...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +-
.../GridGgfsNearOnlyMultiNodeSelfTest.java | 2 +-
.../ignitefs/IgniteFsEventsTestSuite.java | 2 +-
.../hadoop/GridHadoopCommandLineTest.java | 4 +-
.../hadoop/GridHadoopPopularWordsTest.java | 6 +-
.../loadtests/ggfs/GridGgfsNodeStartup.java | 6 +-
.../ggfs/GridGgfsPerformanceBenchmark.java | 2 +-
.../IgniteFsLinuxAndMacOSTestSuite.java | 4 +-
modules/hibernate/pom.xml | 2 +-
.../GridHibernateCollectionRegion.java | 2 +-
.../hibernate/GridHibernateEntityRegion.java | 2 +-
.../GridHibernateNonStrictAccessStrategy.java | 2 +-
.../GridHibernateQueryResultsRegion.java | 2 +-
.../GridHibernateReadOnlyAccessStrategy.java | 2 +-
.../GridHibernateReadWriteAccessStrategy.java | 2 +-
.../hibernate/GridHibernateRegionFactory.java | 10 +-
...ridHibernateTransactionalAccessStrategy.java | 2 +-
.../GridHibernateTransactionalDataRegion.java | 6 +-
.../apache/ignite/cache/hibernate/package.html | 6 +-
.../hibernate/CacheHibernateBlobStore.java | 2 +-
.../CacheHibernateBlobStoreEntry.hbm.xml | 8 +-
.../ignite/cache/store/hibernate/package.html | 3 +-
.../CacheHibernateBlobStoreSelfTest.java | 8 +-
.../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 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
.../query/h2/sql/GridQueryParsingTest.java | 22 +-
modules/jcl/pom.xml | 2 +-
.../apache/ignite/logger/jcl/GridJclLogger.java | 170 --
.../ignite/logger/jcl/IgniteJclLogger.java | 170 ++
.../org/apache/ignite/logger/jcl/package.html | 3 +-
.../ignite/logger/jcl/GridJclLoggerTest.java | 48 -
.../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 +
.../org/apache/ignite/logger/jcl/package.html | 3 +-
.../ignite/testsuites/IgniteJclTestSuite.java | 2 +-
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 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 12 +-
.../org/apache/ignite/logger/log4j/package.html | 2 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 2 +-
.../logger/log4j/GridLog4jLoggingFileTest.java | 2 +-
.../logger/log4j/GridLog4jLoggingUrlTest.java | 2 +-
.../org/apache/ignite/logger/log4j/package.html | 3 +-
modules/rest-http/pom.xml | 2 +-
.../http/jetty/GridJettyRestProtocol.java | 8 +-
.../rest/protocols/http/jetty/package.html | 3 +-
.../rest/protocols/http/jetty/rest.html | 20 +-
modules/scalar/pom.xml | 10 +-
.../ignite/scalar/ScalarConversions.scala | 2 +-
.../org/apache/ignite/scalar/pimps/Packet.scala | 2 +-
.../ignite/scalar/pimps/ScalarCachePimp.scala | 2 +-
.../pimps/ScalarCacheProjectionPimp.scala | 4 +-
.../ignite/scalar/pimps/ScalarGridPimp.scala | 2 +-
.../scalar/pimps/ScalarProjectionPimp.scala | 10 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 14 +-
.../scalar/src/test/resources/spring-cache.xml | 2 +-
.../test/resources/spring-ping-pong-partner.xml | 6 +-
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 +-
.../ignite/logger/slf4j/GridSlf4jLogger.java | 4 +-
.../org/apache/ignite/logger/slf4j/package.html | 3 +-
modules/spring/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteSpring.java | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 16 +-
.../cache/spring/SpringDynamicCacheManager.java | 8 +-
.../org/apache/ignite/cache/spring/package.html | 3 +-
.../spring/IgniteSpringProcessorImpl.java | 4 +-
.../ignite/internal/GridFactorySelfTest.java | 8 +-
.../resource/GridResourceProcessorSelfTest.java | 2 +-
.../internal/processors/resource/package.html | 2 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 12 +-
.../org/apache/ignite/spring/spring-caching.xml | 2 +-
.../ignite/spring/spring-dynamic-caching.xml | 2 +-
.../testsuites/IgniteResourceSelfTestSuite.java | 2 +-
modules/ssh/pom.xml | 2 +-
.../internal/IgniteNodeStartUtilsSelfTest.java | 2 +-
...gniteProjectionStartStopRestartSelfTest.java | 58 +-
modules/tools/pom.xml | 2 +-
.../ignite/tools/ant/beautifier/package.html | 2 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 6 +-
.../optimized/OptimizedClassNamesGenerator.java | 8 +-
.../util/antgar/IgniteDeploymentGarAntTask.java | 10 +-
.../org/apache/ignite/util/antgar/package.html | 3 +-
modules/urideploy/pom.xml | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 28 +-
.../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 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 2 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +-
...loymentClassLoaderMultiThreadedSelfTest.java | 4 +-
.../GridUriDeploymentClassLoaderSelfTest.java | 2 +-
...riDeploymentClassloaderRegisterSelfTest.java | 2 +-
.../GridUriDeploymentFileProcessorSelfTest.java | 14 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../uri/GridUriDeploymentSimpleSelfTest.java | 2 +-
.../META-INF/bad-signed-deployfile-gridgain.xml | 39 -
.../META-INF/bad-signed-deployfile-ignite.xml | 39 +
.../spi/deployment/uri/META-INF/bad_classes.xml | 4 +-
.../META-INF/deploy-with-resources-gridgain.xml | 37 -
.../META-INF/deploy-with-resources-ignite.xml | 37 +
.../uri/META-INF/deploydepend-gridgain.xml | 37 -
.../uri/META-INF/deploydepend-ignite.xml | 37 +
.../uri/META-INF/deploydir-gridgain.xml | 38 -
.../uri/META-INF/deploydir-ignite.xml | 38 +
.../uri/META-INF/deployfile-gridgain.xml | 38 -
.../uri/META-INF/deployfile-ignite.xml | 38 +
.../deployment/uri/META-INF/gridgain.brokenxml | 18 -
.../spi/deployment/uri/META-INF/gridgain.empty | 0
.../deployment/uri/META-INF/gridgain.incorrefs | 18 -
.../spi/deployment/uri/META-INF/gridgain.xml | 38 -
.../deployment/uri/META-INF/ignite.brokenxml | 18 +
.../spi/deployment/uri/META-INF/ignite.empty | 0
.../deployment/uri/META-INF/ignite.incorrefs | 18 +
.../spi/deployment/uri/META-INF/ignite.xml | 38 +
.../deployment/uri/META-INF/p2p-gridgain.xml | 42 -
.../spi/deployment/uri/META-INF/p2p-ignite.xml | 42 +
.../well-signed-deployfile-gridgain.xml | 38 -
.../META-INF/well-signed-deployfile-ignite.xml | 38 +
.../ignite/spi/deployment/uri/package.html | 3 +-
.../GridFileDeploymentUndeploySelfTest.java | 2 +-
.../deployment/uri/scanners/file/package.html | 2 +-
.../deployment/uri/scanners/ftp/package.html | 3 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
.../deployment/uri/scanners/http/package.html | 3 +-
.../apache/ignite/tools/GridToolsSelfTest.java | 16 +-
.../ignite/tools/gartask/META-INF/gridgain.xml | 38 -
.../ignite/tools/gartask/META-INF/ignite.xml | 38 +
.../java/org/apache/ignite/tools/package.html | 2 +-
modules/visor-console/pom.xml | 6 +-
.../scala/org/apache/ignite/visor/Packet.scala | 4 +-
.../ignite/visor/commands/VisorConsole.scala | 2 +-
.../commands/alert/VisorAlertCommand.scala | 6 +-
.../config/VisorConfigurationCommand.scala | 2 +-
.../ignite/visor/commands/disco/Packet.scala | 6 +-
.../commands/disco/VisorDiscoveryCommand.scala | 12 +-
.../ignite/visor/commands/events/Packet.scala | 6 +-
.../commands/events/VisorEventsCommand.scala | 12 +-
.../visor/commands/kill/VisorKillCommand.scala | 4 +-
.../visor/commands/node/VisorNodeCommand.scala | 4 +-
.../ignite/visor/commands/start/Packet.scala | 8 +-
.../commands/start/VisorStartCommand.scala | 16 +-
.../ignite/visor/commands/tasks/Packet.scala | 6 +-
.../commands/tasks/VisorTasksCommand.scala | 12 +-
.../commands/top/VisorTopologyCommand.scala | 4 +-
.../visor/commands/vvm/VisorVvmCommand.scala | 4 +-
.../scala/org/apache/ignite/visor/visor.scala | 38 +-
modules/visor-plugins/pom.xml | 6 +-
.../org/apache/ignite/visor/plugin/package.html | 3 +-
modules/web/pom.xml | 2 +-
.../cache/websession/GridWebSessionFilter.java | 8 +-
.../apache/ignite/cache/websession/package.html | 2 +-
.../IgniteServletContextListenerStartup.java | 20 +-
.../startup/servlet/IgniteServletStartup.java | 26 +-
.../apache/ignite/startup/servlet/package.html | 3 +-
.../internal/websession/WebSessionSelfTest.java | 2 +-
.../websession/WebSessionServerStart.java | 2 +-
.../config/benchmark-atomic-win.properties | 2 +-
.../config/benchmark-atomic.properties | 2 +-
.../config/benchmark-compute-win.properties | 2 +-
.../config/benchmark-compute.properties | 2 +-
.../config/benchmark-query-win.properties | 2 +-
.../yardstick/config/benchmark-query.properties | 4 +-
.../config/benchmark-tx-win.properties | 2 +-
.../yardstick/config/benchmark-tx.properties | 2 +-
.../yardstick/config/benchmark-win.properties | 2 +-
modules/yardstick/config/benchmark.properties | 2 +-
modules/yardstick/pom.xml | 10 +
.../org/apache/ignite/yardstick/IgniteNode.java | 4 +-
.../cache/IgniteGetOffHeapBenchmark.java | 2 +-
.../cache/IgniteGetOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutGetOffHeapBenchmark.java | 2 +-
.../IgnitePutGetOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutGetTxOffHeapBenchmark.java | 2 +-
.../IgnitePutGetTxOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutOffHeapBenchmark.java | 2 +-
.../cache/IgnitePutOffHeapValuesBenchmark.java | 2 +-
.../cache/IgnitePutTxOffHeapBenchmark.java | 2 +-
.../IgnitePutTxOffHeapValuesBenchmark.java | 2 +-
.../IgniteSqlQueryJoinOffHeapBenchmark.java | 2 +-
.../cache/IgniteSqlQueryOffHeapBenchmark.java | 2 +-
.../IgniteSqlQueryPutOffHeapBenchmark.java | 2 +-
pom.xml | 72 +
1136 files changed, 14074 insertions(+), 16731 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/config/fabric/default-config.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/config/hadoop/default-config.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/config/java.util.logging.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/config/router/default-router.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/docs/core-site.ignite.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/config/example-cache.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/config/example-compute.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/config/example-streamer.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/config/filesystem/core-site.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/config/filesystem/example-ignitefs.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package.html
----------------------------------------------------------------------
diff --cc
examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package.html
index 2d7510e,0000000..55b2ad4
mode 100644,000000..100644
---
a/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package.html
+++
b/examples/src/main/java/org/apache/ignite/examples/computegrid/failover/package.html
@@@ -1,23 -1,0 +1,24 @@@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- -->
++-->
++
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<body>
+ <!-- Package description. -->
+ Compute failover example.
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package.html
----------------------------------------------------------------------
diff --cc
examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package.html
index c52f593,0000000..4ec64f2
mode 100644,000000..100644
---
a/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package.html
+++
b/examples/src/main/java/org/apache/ignite/examples/computegrid/montecarlo/package.html
@@@ -1,24 -1,0 +1,24 @@@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- -->
++-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<body>
+ <!-- Package description. -->
+ Monte-Carlo simulation example.
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/src/main/java/org/apache/ignite/examples/computegrid/package.html
----------------------------------------------------------------------
diff --cc
examples/src/main/java/org/apache/ignite/examples/computegrid/package.html
index 5e8d2e2,0000000..c17cd4e
mode 100644,000000..100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/package.html
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/package.html
@@@ -1,23 -1,0 +1,24 @@@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- -->
++-->
++
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<body>
+ <!-- Package description. -->
+ Basic examples for computational ignite functionality.
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/src/main/java/org/apache/ignite/examples/datastructures/package.html
----------------------------------------------------------------------
diff --cc
examples/src/main/java/org/apache/ignite/examples/datastructures/package.html
index f9c708f,0000000..880da2c
mode 100644,000000..100644
---
a/examples/src/main/java/org/apache/ignite/examples/datastructures/package.html
+++
b/examples/src/main/java/org/apache/ignite/examples/datastructures/package.html
@@@ -1,23 -1,0 +1,24 @@@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- -->
++-->
++
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<body>
+ <!-- Package description. -->
+ Demonstrates using of blocking and non-blocking queues and atomic data
structures.
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
----------------------------------------------------------------------
diff --cc
modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
index 9d470d3,176343e..258b51d
---
a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
+++
b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java
@@@ -69,9 -69,9 +69,9 @@@ public class GridifySingleSplitLoadTes
/*
*/
@SuppressWarnings("TypeMayBeWeakened")
- IgniteLog4jLogger log = (IgniteLog4jLogger)cfg.getGridLogger();
+ Log4JLogger log = (Log4JLogger)cfg.getGridLogger();
- log.getLogger("org.gridgain.grid").setLevel(Level.INFO);
+ log.getLogger("org.apache.ignite").setLevel(Level.INFO);
((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/resources/spring-router-ssl.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/resources/spring-router.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index 8230dad,e4503f8..b473905
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@@ -54,13 -55,13 +54,13 @@@ import java.util.concurrent.*
* not have any alive nodes), then {@link
org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException} will be
thrown out of result future.
* <h1 class="header">Serializable</h1>
* Also note that {@link Runnable} and {@link Callable} implementations must
support serialization as required
- * by the configured marshaller. For example, {@link
IgniteOptimizedMarshaller} requires {@link Serializable}
+ * by the configured marshaller. For example, {@link
org.apache.ignite.marshaller.optimized.OptimizedMarshaller} requires {@link
Serializable}
* objects by default, but can be configured not to. Generally speaking
objects that implement {@link Serializable}
* or {@link Externalizable} will perform better. For {@link Runnable} and
{@link Callable} interfaces
- * GridGain provides analogous {@link IgniteRunnable} and {@link
IgniteCallable} classes which are
+ * Ignite provides analogous {@link IgniteRunnable} and {@link
IgniteCallable} classes which are
* {@link Serializable} and should be used to run computations on the grid.
* <h1 class="header">Load Balancing</h1>
- * In all cases other than {@code broadcast(...)}, GridGain must select a
node for a computation
+ * In all cases other than {@code broadcast(...)}, Ignite must select a node
for a computation
* to be executed. The node will be selected based on the underlying {@link
LoadBalancingSpi},
* which by default sequentially picks next available node from grid
projection. Other load balancing
* policies, such as {@code random} or {@code adaptive}, can be configured as
well by selecting
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
index 90f75c1,dabe4d7..f6adecb
--- a/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteEvents.java
@@@ -197,10 -197,10 +197,10 @@@ public interface IgniteEvents extends I
* to be thrown.
*
* @param evt Locally generated event.
- * @throws IllegalArgumentException If event type is within GridGain
reserved range between {@code 1} and
+ * @throws IllegalArgumentException If event type is within Ignite
reserved range between {@code 1} and
* {@code 1000}.
*/
- public void recordLocal(IgniteEvent evt);
+ public void recordLocal(Event evt);
/**
* Adds an event listener for local events. Note that listener will be
added regardless of whether
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b08492a5/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
----------------------------------------------------------------------
