Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-111
Conflicts:
modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml
modules/core/src/test/resources/load/html/index.html
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f43a4e2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f43a4e2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f43a4e2d
Branch: refs/heads/ignite-57
Commit: f43a4e2d9e4ee5a2db855a18da8c9267add3692d
Parents: bf2fe41 d227081
Author: avinogradov <avinogra...@gridgain.com>
Authored: Fri Feb 6 17:14:08 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Fri Feb 6 17:14:08 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 22 +-
bin/ignite.sh | 4 +-
bin/igniterouter.sh | 2 +-
bin/ignitevisorcmd.bat | 26 +-
bin/ignitevisorcmd.sh | 4 +-
bin/include/functions.sh | 10 +-
bin/include/parseargs.bat | 2 +-
bin/include/parseargs.sh | 2 +-
bin/include/service.sh | 8 +-
bin/include/setenv.bat | 10 +-
bin/include/setenv.sh | 8 +-
bin/setup-hadoop.bat | 4 +-
bin/setup-hadoop.sh | 6 +-
config/hadoop/default-config.xml | 20 +-
config/java.util.logging.properties | 2 +-
config/router/default-router.xml | 4 +-
.../IgniteAtomicReferenceExample.java | 2 +-
.../IgniteAtomicStampedExample.java | 2 +-
.../streaming/StreamingCheckInExample.java | 2 +-
.../StreamingPopularNumbersExample.java | 2 +-
.../streaming/StreamingPriceBarsExample.java | 2 +-
.../apache/ignite/examples/ComputeExample.java | 6 +-
.../examples/ScalarCacheAffinityExample1.scala | 3 +-
.../test/config/aop/aspectj/META-INF/aop.xml | 8 +-
.../config/aop/jboss/jboss-gridgain-aop.xml | 38 -
.../GridifySetToXXXNonSpringAopSelfTest.java | 4 +-
.../GridifySetToXXXSpringAopSelfTest.java | 4 +-
.../ignite/gridify/NonSpringAopSelfTest.java | 6 +-
.../testsuites/IgniteAopSelfTestSuite.java | 2 +-
.../gridify/GridifySingleSplitLoadTest.java | 2 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 4 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +-
.../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +-
.../config/grid-client-config.properties | 4 +-
.../config/grid-client-spring-config.xml | 4 +-
modules/clients/readme.md | 8 +-
.../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 +-
.../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 +-
modules/clients/src/test/resources/log4j.xml | 12 +-
.../clients/src/test/resources/spring-cache.xml | 16 +-
.../src/test/resources/spring-router-ssl.xml | 6 +-
.../src/test/resources/spring-router.xml | 6 +-
.../src/test/resources/spring-server-node.xml | 10 +-
.../test/resources/spring-server-ssl-node.xml | 10 +-
.../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 | 34 +-
.../org/apache/ignite/IgniteDataLoader.java | 4 +-
.../java/org/apache/ignite/IgniteEvents.java | 10 +-
.../main/java/org/apache/ignite/IgniteFs.java | 4 +-
.../java/org/apache/ignite/IgniteLogger.java | 14 +-
.../java/org/apache/ignite/IgniteManaged.java | 36 +-
.../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/IgniteState.java | 2 +-
.../main/java/org/apache/ignite/Ignition.java | 20 +-
.../apache/ignite/cache/CacheProjection.java | 2 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../CacheRendezvousAffinityFunction.java | 2 +-
.../cache/eviction/CacheEvictionPolicy.java | 6 +-
.../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 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 6 +-
.../org/apache/ignite/client/GridClient.java | 4 +-
.../apache/ignite/client/GridClientCompute.java | 6 +-
.../ignite/client/GridClientConfiguration.java | 4 +-
.../apache/ignite/client/GridClientData.java | 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 | 2 +-
.../client/marshaller/optimized/package.html | 2 +-
.../impl/GridRouterCommandLineStartup.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 2 +-
.../org/apache/ignite/client/ssl/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 +-
.../ClientConnectionConfiguration.java | 8 +-
.../configuration/IgniteAddressResolver.java | 2 +-
.../configuration/IgniteConfiguration.java | 110 +-
.../configuration/IgniteDeploymentMode.java | 20 +-
.../configuration/IgniteQueryConfiguration.java | 8 +-
.../events/IgniteAuthenticationEvent.java | 8 +-
.../ignite/events/IgniteAuthorizationEvent.java | 8 +-
.../apache/ignite/events/IgniteCacheEvent.java | 12 +-
.../events/IgniteCachePreloadingEvent.java | 12 +-
.../events/IgniteCacheQueryExecutedEvent.java | 12 +-
.../events/IgniteCacheQueryReadEvent.java | 12 +-
.../ignite/events/IgniteCheckpointEvent.java | 12 +-
.../ignite/events/IgniteDeploymentEvent.java | 12 +-
.../ignite/events/IgniteDiscoveryEvent.java | 12 +-
.../org/apache/ignite/events/IgniteEvent.java | 16 +-
.../apache/ignite/events/IgniteEventType.java | 176 +-
.../org/apache/ignite/events/IgniteFsEvent.java | 12 +-
.../apache/ignite/events/IgniteJobEvent.java | 12 +-
.../ignite/events/IgniteLicenseEvent.java | 12 +-
.../ignite/events/IgniteSecureSessionEvent.java | 12 +-
.../ignite/events/IgniteSwapSpaceEvent.java | 12 +-
.../apache/ignite/events/IgniteTaskEvent.java | 16 +-
.../java/org/apache/ignite/events/package.html | 2 +-
.../apache/ignite/fs/IgniteFsConfiguration.java | 12 +-
.../fs/IgniteFsGroupDataBlocksKeyMapper.java | 2 +-
.../fs/IgniteFsInvalidHdfsVersionException.java | 4 +-
.../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/IgniteComputeImpl.java | 21 +-
.../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 +-
.../internal/fs/common/GridGgfsMessage.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../managers/communication/GridIoManager.java | 2 +-
.../discovery/GridDiscoveryManager.java | 6 +-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../managers/security/GridSecurityContext.java | 6 +-
.../processors/cache/GridCacheAttributes.java | 6 +-
.../processors/cache/GridCacheProcessor.java | 4 +-
.../processors/cache/GridCacheUtils.java | 21 +-
.../processors/cache/IgniteCacheProxy.java | 4 +
.../cache/query/GridCacheSqlIndexMetadata.java | 2 +-
.../cache/query/GridCacheSqlMetadata.java | 4 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../internal/processors/fs/GridGgfsContext.java | 2 +-
.../internal/processors/fs/GridGgfsImpl.java | 4 +-
.../processors/fs/IgniteFsProcessor.java | 6 +-
.../internal/processors/hadoop/GridHadoop.java | 2 +-
.../processors/hadoop/GridHadoopJob.java | 4 +-
.../hadoop/GridHadoopJobProperty.java | 4 +-
.../license/GridLicenseProcessor.java | 2 +-
.../license/GridLicenseSubsystem.java | 2 +-
.../resource/GridSpringResourceContext.java | 2 +-
.../processors/rest/GridRestProcessor.java | 2 +-
.../processors/rest/client/message/package.html | 2 +-
.../handlers/log/GridLogCommandHandler.java | 4 +-
.../top/GridTopologyCommandHandler.java | 4 +-
.../protocols/tcp/GridClientPacketType.java | 4 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 6 +-
.../schedule/IgniteNoopScheduleProcessor.java | 4 +-
.../spring/IgniteSpringProcessor.java | 4 +-
.../streamer/GridStreamProcessor.java | 2 +-
.../ignite/internal/product/IgniteProduct.java | 6 +-
.../internal/product/IgniteProductLicense.java | 4 +-
.../internal/util/GridConfigurationFinder.java | 12 +-
.../ignite/internal/util/IgniteUtils.java | 84 +-
.../internal/util/lang/GridAbsClosure.java | 4 +-
.../ignite/internal/util/lang/GridFunc.java | 2 +-
.../internal/util/lang/GridPeerDeployAware.java | 2 +-
.../util/lang/GridPeerDeployAwareAdapter.java | 2 +-
.../nio/GridConnectionBytesVerifyFilter.java | 2 +-
.../util/portscanner/GridJmxPortFinder.java | 2 +-
.../apache/ignite/internal/util/typedef/CA.java | 3 +-
.../ignite/internal/util/typedef/CAX.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 8 +-
.../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 +-
.../ignite/jdbc/IgniteJdbcConnection.java | 8 +-
.../ignite/jdbc/IgniteJdbcDatabaseMetadata.java | 6 +-
.../apache/ignite/jdbc/IgniteJdbcDriver.java | 30 +-
.../apache/ignite/jdbc/IgniteJdbcResultSet.java | 2 +-
.../apache/ignite/jdbc/IgniteJdbcStatement.java | 2 +-
.../org/apache/ignite/lang/IgniteClosure.java | 2 +-
.../org/apache/ignite/lang/IgnitePredicate.java | 2 +-
.../org/apache/ignite/lang/IgniteRunnable.java | 2 +-
.../apache/ignite/lifecycle/LifecycleAware.java | 2 +-
.../apache/ignite/lifecycle/LifecycleBean.java | 4 +-
.../ignite/logger/IgniteLoggerNodeIdAware.java | 2 +-
.../ignite/logger/java/IgniteJavaLogger.java | 12 +-
.../apache/ignite/managed/ManagedService.java | 14 +-
.../managed/ManagedServiceConfiguration.java | 2 +-
.../ignite/marshaller/IgniteMarshaller.java | 4 +-
.../marshaller/IgniteMarshallerExclusions.java | 6 +-
.../marshaller/jdk/IgniteJdkMarshaller.java | 2 +-
.../optimized/IgniteOptimizedClassResolver.java | 2 +-
.../optimized/IgniteOptimizedMarshallable.java | 2 +-
.../optimized/IgniteOptimizedMarshaller.java | 4 +-
.../IgniteOptimizedObjectInputStream.java | 2 +-
.../IgniteOptimizedObjectOutputStream.java | 2 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 20 +-
.../ignite/plugin/security/GridSecurity.java | 6 +-
.../security/GridSecurityCredentials.java | 2 +-
.../GridSecurityCredentialsProvider.java | 2 +-
.../segmentation/GridSegmentationPolicy.java | 2 +-
.../segmentation/GridSegmentationResolver.java | 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 +-
.../ignite/resources/IgniteServiceResource.java | 2 +-
.../IgniteSpringApplicationContextResource.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 6 +-
.../ignite/spi/IgniteSpiConfiguration.java | 2 +-
.../ignite/spi/IgniteSpiManagementMBean.java | 8 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 2 +-
.../spi/authentication/AuthenticationSpi.java | 6 +-
.../noop/NoopAuthenticationSpi.java | 6 +-
.../ignite/spi/checkpoint/CheckpointSpi.java | 4 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 6 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 4 +-
.../sharedfs/SharedFsCheckpointSpi.java | 6 +-
.../ignite/spi/collision/CollisionSpi.java | 6 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 4 +-
.../jobstealing/JobStealingCollisionSpi.java | 2 +-
.../PriorityQueueCollisionSpi.java | 2 +-
.../spi/communication/CommunicationSpi.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 6 +-
.../ignite/spi/deployment/DeploymentSpi.java | 4 +-
.../spi/discovery/DiscoveryMetricsProvider.java | 2 +-
.../ignite/spi/discovery/DiscoverySpi.java | 8 +-
.../spi/discovery/DiscoverySpiDataExchange.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 30 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../tcp/internal/TcpDiscoveryNode.java | 6 +-
.../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 6 +-
.../spi/eventstorage/EventStorageSpi.java | 4 +-
.../memory/MemoryEventStorageSpi.java | 4 +-
.../apache/ignite/spi/failover/FailoverSpi.java | 4 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 2 +-
.../jobstealing/JobStealingFailoverSpi.java | 14 +-
.../spi/failover/never/NeverFailoverSpi.java | 2 +-
.../ignite/spi/indexing/GridIndexingSpi.java | 2 +-
.../spi/loadbalancing/LoadBalancingSpi.java | 4 +-
.../adaptive/AdaptiveCpuLoadProbe.java | 6 +-
.../adaptive/AdaptiveJobCountLoadProbe.java | 6 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-
.../adaptive/AdaptiveLoadProbe.java | 2 +-
.../AdaptiveProcessingTimeLoadProbe.java | 6 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../spi/securesession/SecureSessionSpi.java | 6 +-
.../noop/NoopSecureSessionSpi.java | 6 +-
.../ignite/spi/swapspace/SwapSpaceSpi.java | 6 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../ignite/startup/cmdline/AboutDialog.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 10 +-
.../startup/cmdline/CommandLineTransformer.java | 4 +-
.../org/apache/ignite/startup/package-info.java | 2 +-
.../ignite/streamer/StreamerConfiguration.java | 10 +-
.../apache/ignite/streamer/StreamerWindow.java | 2 +-
.../org/apache/ignite/thread/IgniteThread.java | 2 +-
.../apache/ignite/transactions/IgniteTx.java | 4 +-
.../spring-cache-client-benchmark-1.xml | 8 +-
.../spring-cache-client-benchmark-2.xml | 8 +-
.../spring-cache-client-benchmark-3.xml | 8 +-
modules/core/src/test/config/example-cache.xml | 2 +-
modules/core/src/test/config/ggfs-shmem.xml | 8 +-
.../src/test/config/load/cache-benchmark.xml | 2 +-
.../test/config/load/cache-client-benchmark.xml | 2 +-
.../config/load/dsi-49-server-production.xml | 2 +-
.../src/test/config/load/merge-sort-base.xml | 8 +-
modules/core/src/test/config/log4j-test.xml | 8 +-
.../core/src/test/config/spring-cache-load.xml | 8 +-
.../config/spring-cache-put-remove-load.xml | 2 +-
.../core/src/test/config/spring-cache-swap.xml | 2 +-
.../src/test/config/spring-cache-teststore.xml | 4 +-
.../core/src/test/config/spring-multicache.xml | 8 +-
.../src/test/config/spring-start-nodes-attr.xml | 2 +-
.../core/src/test/config/spring-start-nodes.xml | 2 +-
.../average/spring-streamer-average-base.xml | 8 +-
.../average/spring-streamer-average-local.xml | 8 +-
.../average/spring-streamer-average-random.xml | 8 +-
.../config/streamer/spring-streamer-base.xml | 8 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 10 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 12 +-
.../internal/GridAffinityP2PSelfTest.java | 4 +-
.../internal/GridCacheProjectionRemoveTest.java | 6 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 2 +-
.../ignite/internal/GridHomePathSelfTest.java | 4 +-
.../GridJobMasterLeaveAwareSelfTest.java | 4 +-
.../internal/GridManagementJobSelfTest.java | 7 +-
.../GridNodeVisorAttributesSelfTest.java | 4 +-
.../internal/GridProjectionAbstractTest.java | 18 +-
.../internal/GridReleaseTypeSelfTest.java | 4 +-
.../apache/ignite/internal/GridStartupMain.java | 8 +-
.../apache/ignite/internal/GridStartupTest.java | 8 +-
.../GridTaskCancelSingleNodeSelfTest.java | 2 -
.../GridTaskExecutionContextSelfTest.java | 4 +-
.../GridTopologyBuildVersionSelfTest.java | 8 +-
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
.../IgniteComputeEmptyClusterGroupTest.java | 4 +-
.../communication/GridIoManagerSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 83 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 206 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2214 +++---------------
.../GridCacheAbstractIteratorsSelfTest.java | 84 +-
.../GridCacheAbstractProjectionSelfTest.java | 857 -------
.../cache/GridCacheAbstractSelfTest.java | 36 +-
.../cache/GridCacheAffinityApiSelfTest.java | 42 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 13 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 111 +-
...acheBasicStoreMultithreadedAbstractTest.java | 5 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 2 +-
.../GridCacheQueryInternalKeysSelfTest.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 +-
.../GridCacheMultiNodeDataStructureTest.java | 2 +-
.../GridCacheQueueCleanupSelfTest.java | 2 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 2 +-
.../GridCacheSetAbstractSelfTest.java | 3 +-
...acheEntrySetIterationPreloadingSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 3 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 4 +-
.../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 | 72 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 132 +-
.../near/GridCacheNearEvictionSelfTest.java | 5 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 152 +-
.../near/GridCacheNearOneNodeSelfTest.java | 44 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 217 +-
.../near/GridCacheNearReadersSelfTest.java | 14 +-
.../GridCachePartitionedAffinitySelfTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 47 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 4 +-
.../GridCachePartitionedEntryLockSelfTest.java | 75 +-
...titionedExplicitLockNodeFailureSelfTest.java | 24 +-
...GridCachePartitionedFilteredPutSelfTest.java | 55 +-
.../GridCachePartitionedFullApiSelfTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 6 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 208 +-
.../GridCachePartitionedProjectionSelfTest.java | 155 --
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 17 +-
.../GridCacheReplicatedProjectionSelfTest.java | 66 -
.../GridCacheDistributedEvictionsSelfTest.java | 2 -
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
.../IgniteCacheLoadAllAbstractTest.java | 6 +-
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 132 +-
.../GridCacheLocalAtomicProjectionSelfTest.java | 32 -
.../local/GridCacheLocalFullApiSelfTest.java | 63 +-
.../local/GridCacheLocalIteratorsSelfTest.java | 51 +-
.../local/GridCacheLocalProjectionSelfTest.java | 38 -
.../closure/GridClosureProcessorSelfTest.java | 14 +-
.../continuous/GridEventConsumeSelfTest.java | 4 +-
.../GridDataLoaderProcessorSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 4 +-
.../apache/ignite/internal/updatestatus.html | 4 +-
...artupWithSpecifiedWorkDirectorySelfTest.java | 8 +-
...tartupWithUndefinedGridGainHomeSelfTest.java | 106 -
...dStartupWithUndefinedIgniteHomeSelfTest.java | 106 +
.../internal/util/IgniteUtilsSelfTest.java | 6 +-
.../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../jvmtest/ServerSocketMultiThreadedTest.java | 4 +-
.../apache/ignite/lang/GridFuncSelfTest.java | 4 +-
.../loadtest/GridSingleExecutionTest.java | 6 +-
.../cache/GridCacheAbstractLoadTest.java | 10 +-
.../loadtests/cache/GridCacheBenchmark.java | 8 +-
.../cache/GridCacheGroupLockComparisonTest.java | 12 +-
.../GridCacheWriteBehindStoreLoadTest.java | 19 +-
.../capacity/spring-capacity-cache.xml | 8 +-
.../colocation/GridTestLifecycleBean.java | 3 +-
.../loadtests/colocation/GridTestMain.java | 2 +-
.../loadtests/colocation/spring-colocation.xml | 8 +-
.../communication/GridIoManagerBenchmark.java | 2 +-
.../GridTcpCommunicationBenchmark.java | 12 +-
.../GridSingleSplitsRedeployLoadTest.java | 2 +-
.../loadtests/discovery/GridGcTimeoutTest.java | 2 +-
.../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +-
.../ignite/loadtests/job/GridJobLoadTest.java | 4 +-
.../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 +
.../marshaller/GridMarshallerAbstractTest.java | 2 +-
.../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 +
.../spi/GridTcpSpiForwardingSelfTest.java | 3 +-
.../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 -
.../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 +
...redFsCheckpointSpiMultiThreadedSelfTest.java | 2 +-
...bStealingCollisionSpiAttributesSelfTest.java | 2 +-
...alingCollisionSpiCustomTopologySelfTest.java | 2 +-
.../GridJobStealingCollisionSpiSelfTest.java | 2 +-
...obStealingCollisionSpiStartStopSelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 4 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 4 +-
.../AbstractDiscoveryRandomStartStopTest.java | 213 ++
.../discovery/AbstractDiscoverySelfTest.java | 496 ++++
.../spi/discovery/AbstractDiscoveryTest.java | 153 ++
...ridAbstractDiscoveryRandomStartStopTest.java | 213 --
.../GridAbstractDiscoverySelfTest.java | 496 ----
.../discovery/GridAbstractDiscoveryTest.java | 153 --
.../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 +
...idTcpDiscoveryMulticastIpFinderSelfTest.java | 115 -
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 115 +
...ridTcpDiscoverySharedFsIpFinderSelfTest.java | 56 -
.../TcpDiscoverySharedFsIpFinderSelfTest.java | 56 +
.../vm/GridTcpDiscoveryVmIpFinderSelfTest.java | 193 --
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 193 ++
...idJobStealingFailoverSpiOneNodeSelfTest.java | 4 +-
.../GridJobStealingFailoverSpiSelfTest.java | 2 +-
...JobStealingFailoverSpiStartStopSelfTest.java | 2 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../startup/GridRandomCommandLineLoader.java | 10 +-
.../ignite/startup/GridVmNodesStarter.java | 2 +-
.../cmdline/GridCommandLineLoaderTest.java | 2 +-
.../GridCommandLineTransformerSelfTest.java | 4 +-
.../startup/servlet/GridServletLoaderTest.java | 12 +-
.../ignite/testframework/GridTestNode.java | 4 +-
.../ignite/testframework/GridTestUtils.java | 36 +-
.../config/GridTestProperties.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 19 +-
.../ignite/testframework/junits/IgniteMock.java | 2 +-
.../junits/IgniteTestResources.java | 10 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 56 +-
.../junits/logger/GridTestLog4jLogger.java | 12 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../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 +-
.../util/GridConcurrentLinkedDequeSelfTest.java | 2 -
.../util/GridTopologyHeapSizeSelfTest.java | 2 +-
.../src/test/resources/load/html/index.html | 43 +-
.../core/src/test/webapp/META-INF/gg-config.xml | 18 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 4 +-
modules/extdata/p2p/META-INF/gridgain.xml | 40 -
modules/extdata/p2p/META-INF/ignite.xml | 40 +
.../uri/tasks/GridUriDeploymentDependency1.java | 2 +-
.../uri/tasks/GridUriDeploymentDependency2.java | 2 +-
.../uri/tasks/GridUriDeploymentTestTask2.java | 2 +-
.../client/hadoop/GridHadoopClientProtocol.java | 4 +-
.../GridHadoopClientProtocolProvider.java | 6 +-
.../apache/ignite/client/hadoop/package.html | 2 +-
.../fs/hadoop/GridGgfsHadoopParameters.java | 2 +-
.../fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 12 +-
.../org/apache/ignite/fs/hadoop/v1/package.html | 2 +-
.../fs/hadoop/v2/GridGgfsHadoopFileSystem.java | 12 +-
.../org/apache/ignite/fs/hadoop/v2/package.html | 2 +-
.../hadoop/GridGgfsHadoopFileSystemWrapper.java | 2 +-
.../hadoop/GridHadoopClassLoader.java | 2 +-
.../processors/hadoop/GridHadoopSetup.java | 56 +-
.../GridHadoopExternalTaskExecutor.java | 2 +-
.../child/GridHadoopExternalProcessStarter.java | 4 +-
.../apache/ignite/fs/GridFileSystemLoad.java | 4 +-
...dGgfsHadoop20FileSystemAbstractSelfTest.java | 2 +-
.../fs/GridGgfsHadoopDualAbstractSelfTest.java | 2 +-
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 6 +-
...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +-
.../GridGgfsHadoopFileSystemLoggerSelfTest.java | 2 +-
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 6 +-
...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +-
.../fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 2 +-
.../ignite/fs/IgniteFsEventsTestSuite.java | 2 +-
.../hadoop/GridHadoopCommandLineTest.java | 4 +-
.../hadoop/GridHadoopPopularWordsTest.java | 6 +-
.../loadtests/ggfs/GridGgfsNodeStartup.java | 6 +-
.../ggfs/GridGgfsPerformanceBenchmark.java | 2 +-
.../IgniteFsLinuxAndMacOSTestSuite.java | 4 +-
.../GridHibernateAccessStrategyAdapter.java | 3 +-
.../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 | 4 +-
.../hibernate/CacheHibernateBlobStore.java | 2 +-
.../CacheHibernateBlobStoreEntry.hbm.xml | 2 +-
.../CacheHibernateBlobStoreSelfTest.java | 8 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 2 +-
.../apache/ignite/logger/jcl/GridJclLogger.java | 170 --
.../ignite/logger/jcl/IgniteJclLogger.java | 170 ++
.../ignite/logger/jcl/GridJclLoggerTest.java | 48 -
.../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 +
.../ignite/testsuites/IgniteJclTestSuite.java | 2 +-
.../processors/cache/GridCacheJtaSelfTest.java | 35 +-
.../ignite/logger/log4j/IgniteLog4jLogger.java | 12 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 2 +-
.../logger/log4j/GridLog4jLoggingFileTest.java | 2 +-
.../logger/log4j/GridLog4jLoggingUrlTest.java | 2 +-
.../http/jetty/GridJettyRestProtocol.java | 8 +-
.../rest/protocols/http/jetty/rest.html | 18 +-
modules/scalar/pom.xml | 8 +-
.../ignite/scalar/ScalarConversions.scala | 10 +-
.../ignite/scalar/lang/ScalarOutClosure.scala | 4 +-
.../scalar/lang/ScalarOutClosureFunction.scala | 4 +-
.../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 +-
.../test/resources/spring-ping-pong-partner.xml | 4 +-
.../ignite/logger/slf4j/GridSlf4jLogger.java | 4 +-
.../java/org/apache/ignite/IgniteSpring.java | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 16 +-
.../cache/spring/SpringDynamicCacheManager.java | 8 +-
.../spring/IgniteSpringProcessorImpl.java | 4 +-
.../ignite/internal/GridFactorySelfTest.java | 8 +-
.../resource/GridResourceProcessorSelfTest.java | 2 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 12 +-
.../testsuites/IgniteResourceSelfTestSuite.java | 2 +-
.../internal/IgniteNodeStartUtilsSelfTest.java | 2 +-
...gniteProjectionStartStopRestartSelfTest.java | 58 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 6 +-
.../optimized/OptimizedClassNamesGenerator.java | 8 +-
.../util/antgar/IgniteDeploymentGarAntTask.java | 10 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 28 +-
.../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 | 2 +-
.../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 +
.../GridFileDeploymentUndeploySelfTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
.../apache/ignite/tools/GridToolsSelfTest.java | 16 +-
.../ignite/tools/gartask/META-INF/gridgain.xml | 38 -
.../ignite/tools/gartask/META-INF/ignite.xml | 38 +
modules/visor-console/pom.xml | 4 +-
.../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 | 4 +-
.../cache/websession/GridWebSessionFilter.java | 8 +-
.../IgniteServletContextListenerStartup.java | 20 +-
.../startup/servlet/IgniteServletStartup.java | 26 +-
.../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 +-
.../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 +-
.../yardstick/compute/IgniteRunBenchmark.java | 5 +-
.../yardstick/compute/model/NoopCallable.java | 5 +-
718 files changed, 12019 insertions(+), 15394 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/ignite.bat
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/ignite.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/igniterouter.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/ignitevisorcmd.bat
----------------------------------------------------------------------
diff --cc bin/ignitevisorcmd.bat
index 06fce6d,d45fe9d..ac4a277
--- a/bin/ignitevisorcmd.bat
+++ b/bin/ignitevisorcmd.bat
@@@ -1,22 -1,20 +1,22 @@@
-:: 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
+:: 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.
::
-:: 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.
::
- :: Starts GridGain Visor Console.
+ :: Starts Ignite Visor Console.
::
@echo off
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/ignitevisorcmd.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/include/functions.sh
----------------------------------------------------------------------
diff --cc bin/include/functions.sh
index c1289dd,fbc85b1..f0430c1
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@@ -1,23 -1,21 +1,23 @@@
#!/bin/bash
-# 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
+# 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.
#
-# 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.
#
- # This is a collection of utility functions to be used in other GridGain
scripts.
+ # This is a collection of utility functions to be used in other Ignite
scripts.
# Before calling any function from this file you have to import it:
# if [ "${IGNITE_HOME}" = "" ];
# then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/include/parseargs.bat
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/include/parseargs.sh
----------------------------------------------------------------------
diff --cc bin/include/parseargs.sh
index 87e105d,f8f7852..8045348
--- a/bin/include/parseargs.sh
+++ b/bin/include/parseargs.sh
@@@ -1,23 -1,21 +1,23 @@@
#!/bin/bash
-# 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.
+#
+# 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.
+#
#
- # Parses command line parameters into GridGain variables that are common for
the launcher scripts:
+ # Parses command line parameters into Ignite variables that are common for
the launcher scripts:
# CONFIG
# INTERACTIVE
# QUIET
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/include/service.sh
----------------------------------------------------------------------
diff --cc bin/include/service.sh
index 06634b6,0e221f3..7400ec7
--- a/bin/include/service.sh
+++ b/bin/include/service.sh
@@@ -1,25 -1,23 +1,25 @@@
#!/bin/bash
-# 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
+# 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.
#
-# 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.
####################################################################
- # GridGain Hadoop service start/stop script.
+ # Ignite Hadoop service start/stop script.
# Supposed to be called from unix `init.d` script. Environment must
- # be set via the call of /etc/default/{hadoop,gridgain-hadoop}
+ # be set via the call of /etc/default/{hadoop,ignite-hadoop}
####################################################################
# Stop script on error.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/include/setenv.bat
----------------------------------------------------------------------
diff --cc bin/include/setenv.bat
index 0af224d,c06f2a0..811bc95
--- a/bin/include/setenv.bat
+++ b/bin/include/setenv.bat
@@@ -1,22 -1,20 +1,22 @@@
-:: 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
+:: 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.
::
-:: 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.
::
- :: Exports IGNITE_LIBS variable containing classpath for GridGain.
+ :: Exports IGNITE_LIBS variable containing classpath for Ignite.
:: Expects IGNITE_HOME to be set.
:: Can be used like:
:: call %IGNITE_HOME%\bin\include\setenv.bat
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/include/setenv.sh
----------------------------------------------------------------------
diff --cc bin/include/setenv.sh
index 402f2ad,b740cb3..74b6608
--- a/bin/include/setenv.sh
+++ b/bin/include/setenv.sh
@@@ -1,23 -1,21 +1,23 @@@
#!/bin/bash
-# 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.
+#
+# 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.
+#
#
- # Exports IGNITE_LIBS variable containing classpath for GridGain.
+ # Exports IGNITE_LIBS variable containing classpath for Ignite.
# Expects IGNITE_HOME to be set.
# Can be used like:
# . "${IGNITE_HOME}"/bin/include/setenv.sh
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/setup-hadoop.bat
----------------------------------------------------------------------
diff --cc bin/setup-hadoop.bat
index 61364ed,d68b8e0..c4c73b3
--- a/bin/setup-hadoop.bat
+++ b/bin/setup-hadoop.bat
@@@ -1,22 -1,20 +1,22 @@@
-:: 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
+:: 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.
::
-:: 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.
::
- :: Run this script to configure Hadoop client to work with GridGain.
+ :: Run this script to configure Hadoop client to work with Ignite.
::
@echo off
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/bin/setup-hadoop.sh
----------------------------------------------------------------------
diff --cc bin/setup-hadoop.sh
index 912924a,e82ffa1..3e1cf7d
--- a/bin/setup-hadoop.sh
+++ b/bin/setup-hadoop.sh
@@@ -1,23 -1,21 +1,23 @@@
#!/bin/bash
-# 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.
+#
+# 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.
+#
#
- # Run this script to configure Hadoop client to work with GridGain.
+ # Run this script to configure Hadoop client to work with Ignite.
#
HADOOP_COMMON_HOME=
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/config/hadoop/default-config.xml
----------------------------------------------------------------------
diff --cc config/hadoop/default-config.xml
index 6fd05f0,6e62d68..2ccef87
--- a/config/hadoop/default-config.xml
+++ b/config/hadoop/default-config.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file.
+ Ignite Spring configuration file.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/default-config.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/default-config.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/default-config.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:util="http://www.springframework.org/schema/util";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/config/router/default-router.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/config/grid-client-spring-config.xml
----------------------------------------------------------------------
diff --cc modules/clients/config/grid-client-spring-config.xml
index e14a969,c87e599..93361b6
--- a/modules/clients/config/grid-client-spring-config.xml
+++ b/modules/clients/config/grid-client-spring-config.xml
@@@ -15,12 -15,12 +15,12 @@@
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.
- -->
+-->
<!--
- GridGain Client Spring configuration file to start grid client.
+ Ignite Client Spring configuration file to start grid client.
- When starting GridGain Client from Java IDE, pass configuration bean into
GridClientFactory:
+ When starting Ignite Client from Java IDE, pass configuration bean into
GridClientFactory:
GridClientFactory.start(new FileSystemXmlApplicationContext(
"/path/to/grid-client-spring-config.xml").getBean(GridClientConfiguration.class));
-->
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/src/test/resources/log4j.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --cc modules/clients/src/test/resources/spring-cache.xml
index 5931c2c,7f6a291..3e87608
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("examples/config/example-cache.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("examples/config/example-cache.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/src/test/resources/spring-router-ssl.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/src/test/resources/spring-router.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --cc modules/clients/src/test/resources/spring-server-node.xml
index feee003,dcc5037..fcc775f
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --cc modules/clients/src/test/resources/spring-server-ssl-node.xml
index a63fab7,fc559b2..60503d9
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/main/java/org/apache/ignite/client/impl/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/main/java/org/apache/ignite/client/marshaller/optimized/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/main/java/org/apache/ignite/client/ssl/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/main/java/org/apache/ignite/events/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
----------------------------------------------------------------------
diff --cc
modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
index f8e9f1b,5e11c2b..ebb87b5
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
----------------------------------------------------------------------
diff --cc
modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
index 2a0a998,56575c6..a01884b
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
----------------------------------------------------------------------
diff --cc
modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
index 5d3cfed,3b74318..62cc6a3
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/example-cache.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/ggfs-shmem.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/ggfs-shmem.xml
index 1980e7e,1044748..7366603
--- a/modules/core/src/test/config/ggfs-shmem.xml
+++ b/modules/core/src/test/config/ggfs-shmem.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-ggfs-shmem.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-ggfs-shmem.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-ggfs-shmem.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:util="http://www.springframework.org/schema/util";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/load/cache-benchmark.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/load/cache-benchmark.xml
index 44b25e9,880269b..c791d7a
--- a/modules/core/src/test/config/load/cache-benchmark.xml
+++ b/modules/core/src/test/config/load/cache-benchmark.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/load/cache-client-benchmark.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/load/cache-client-benchmark.xml
index b8508a4,ab3893a..7d2d236
--- a/modules/core/src/test/config/load/cache-client-benchmark.xml
+++ b/modules/core/src/test/config/load/cache-client-benchmark.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/load/dsi-49-server-production.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/load/merge-sort-base.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/log4j-test.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-cache-load.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-cache-load.xml
index c1adc81,921129a..c2a121a
--- a/modules/core/src/test/config/spring-cache-load.xml
+++ b/modules/core/src/test/config/spring-cache-load.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-cache-put-remove-load.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-cache-put-remove-load.xml
index 7d22a0b,a546fa3..f5fd4f5
--- a/modules/core/src/test/config/spring-cache-put-remove-load.xml
+++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-cache-swap.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-cache-swap.xml
index ab327b8,8030f98..da38fb2
--- a/modules/core/src/test/config/spring-cache-swap.xml
+++ b/modules/core/src/test/config/spring-cache-swap.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file.
+ Ignite Spring configuration file.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-cache-teststore.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-cache-teststore.xml
index a8cb0f4,ecdd347..d526cf9
--- a/modules/core/src/test/config/spring-cache-teststore.xml
+++ b/modules/core/src/test/config/spring-cache-teststore.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file.
+ Ignite Spring configuration file.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-multicache.xml
index 736f452,3ca6f27..ab4f23c
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("path-to-this-file/example-benchmark.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("path-to-this-file/example-benchmark.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-start-nodes-attr.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-start-nodes-attr.xml
index 7b8f8e3,49d9232..5844e7b
--- a/modules/core/src/test/config/spring-start-nodes-attr.xml
+++ b/modules/core/src/test/config/spring-start-nodes-attr.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file.
+ Ignite Spring configuration file.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/spring-start-nodes.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/config/spring-start-nodes.xml
index abaed4e,2343611..8b228da
--- a/modules/core/src/test/config/spring-start-nodes.xml
+++ b/modules/core/src/test/config/spring-start-nodes.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file.
+ Ignite Spring configuration file.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
----------------------------------------------------------------------
diff --cc
modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
index 63baebd,77bd5b1..7fd69a4
---
a/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
+++
b/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("examples/config/example-cache.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("examples/config/example-cache.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f43a4e2d/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
----------------------------------------------------------------------
diff --cc
modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
index 5478d75,aacc965..37c675c
---
a/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
+++
b/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup grid cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone Ignite node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file into
GridGain:
- GridGain.start("examples/config/example-cache.xml");
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("examples/config/example-cache.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
