You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/02/03 03:05:51 UTC
[37/44] incubator-ignite git commit: Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f50e805
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f50e805
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f50e805
Branch: refs/heads/ignite-82
Commit: 7f50e8056cebeb773cb569bb3bf8007ef6960585
Parents: 8b57933 06d9b7d
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Feb 2 12:01:10 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Feb 2 12:01:10 2015 +0300
----------------------------------------------------------------------
assembly/libs/readme.txt | 4 +-
assembly/release-base-fabric.xml | 4 +-
assembly/release-base.xml | 6 +-
bin/ggrouter.bat | 33 -
bin/ggrouter.sh | 50 -
bin/ggstart.bat | 228 -
bin/ggstart.sh | 176 -
bin/ggvisorcmd.bat | 144 -
bin/ggvisorcmd.sh | 124 -
bin/ignite.bat | 228 +
bin/ignite.sh | 176 +
bin/igniterouter.bat | 33 +
bin/igniterouter.sh | 50 +
bin/ignitevisorcmd.bat | 144 +
bin/ignitevisorcmd.sh | 124 +
bin/include/functions.sh | 42 +-
bin/include/hadoop-classpath.bat | 2 +-
bin/include/hadoop-classpath.sh | 4 +-
bin/include/parseargs.bat | 2 +-
bin/include/parseargs.sh | 6 +-
bin/include/service.sh | 12 +-
bin/include/setenv.bat | 28 +-
bin/include/setenv.sh | 34 +-
bin/include/target-classpath.bat | 8 +-
bin/include/target-classpath.sh | 14 +-
bin/setup-hadoop.bat | 2 +-
bin/setup-hadoop.sh | 12 +-
config/gridgain-log4j.xml | 152 -
config/hadoop/default-config.xml | 2 +-
config/ignite-log4j.xml | 152 +
config/java.util.logging.properties | 16 +-
config/router/default-router.xml | 2 +-
docs/hadoop_readme.md | 6 +-
docs/ignite_readme.md | 12 +-
docs/mapred-site.ignite.xml | 2 +-
examples/config/example-cache.xml | 2 +-
examples/config/example-streamer.xml | 8 +-
examples/config/filesystem/example-ggfs.xml | 2 +-
examples/config/servlet/WEB-INF/web.xml | 4 +-
examples/rest/http-rest-example.php | 2 +-
examples/rest/memcache-rest-example.php | 2 +-
.../compute/ComputeBroadcastExample.java | 2 +-
.../compute/ComputeCallableExample.java | 2 +-
.../examples/compute/ComputeClosureExample.java | 2 +-
.../compute/ComputeContinuousMapperExample.java | 2 +-
.../compute/ComputeExecutorServiceExample.java | 2 +-
.../ComputeFibonacciContinuationExample.java | 2 +-
.../compute/ComputeProjectionExample.java | 2 +-
.../examples/compute/ComputeReducerExample.java | 2 +-
.../compute/ComputeRunnableExample.java | 2 +-
.../compute/ComputeScheduleExample.java | 2 +-
.../examples/compute/ComputeTaskMapExample.java | 2 +-
.../compute/ComputeTaskSplitExample.java | 2 +-
.../compute/montecarlo/CreditRiskExample.java | 2 +-
.../examples/datagrid/CacheAffinityExample.java | 2 +-
.../examples/datagrid/CacheApiExample.java | 2 +-
.../datagrid/CacheContinuousQueryExample.java | 2 +-
.../datagrid/CacheDataLoaderExample.java | 2 +-
.../examples/datagrid/CacheEventsExample.java | 2 +-
.../datagrid/CachePopularNumbersExample.java | 2 +-
.../examples/datagrid/CachePutGetExample.java | 2 +-
.../examples/datagrid/CacheQueryExample.java | 2 +-
.../datagrid/CacheTransactionExample.java | 2 +-
.../datastructures/CacheAtomicLongExample.java | 2 +-
.../CacheAtomicReferenceExample.java | 2 +-
.../CacheAtomicSequenceExample.java | 2 +-
.../CacheAtomicStampedExample.java | 2 +-
.../CacheCountDownLatchExample.java | 2 +-
.../datastructures/CacheQueueExample.java | 2 +-
.../datastructures/CacheSetExample.java | 2 +-
.../hibernate/HibernateL2CacheExample.java | 2 +-
.../starschema/CacheStarSchemaExample.java | 2 +-
.../ignite/examples/events/EventsExample.java | 2 +-
.../ignite/examples/ggfs/GgfsExample.java | 2 +-
.../examples/ggfs/GgfsMapReduceExample.java | 2 +-
.../ignite/examples/ggfs/GgfsNodeStartup.java | 4 +-
.../examples/messaging/MessagingExample.java | 2 +-
.../messaging/MessagingPingPongExample.java | 2 +-
.../MessagingPingPongListenActorExample.java | 2 +-
.../misc/deployment/DeploymentExample.java | 2 +-
.../misc/springbean/SpringBeanExample.java | 2 +-
.../examples/services/ServicesExample.java | 2 +-
.../streaming/StreamingCheckInExample.java | 8 +-
.../StreamingPopularNumbersExample.java | 8 +-
.../streaming/StreamingPriceBarsExample.java | 8 +-
.../StreamingRunningAverageExample.java | 8 +-
.../apache/ignite/examples/ComputeExample.java | 59 +
.../ignite/examples/MessagingExample.java | 166 +
.../org/gridgain/examples/ComputeExample.java | 59 -
.../org/gridgain/examples/MessagingExample.java | 166 -
.../examples/ScalarCacheAffinityExample1.scala | 2 +-
.../examples/ScalarCacheAffinityExample2.scala | 2 +-
.../ScalarCacheAffinitySimpleExample.scala | 2 +-
.../scalar/examples/ScalarCacheExample.scala | 2 +-
.../ScalarCachePopularNumbersExample.scala | 2 +-
.../examples/ScalarCacheQueryExample.scala | 2 +-
.../scalar/examples/ScalarClosureExample.scala | 2 +-
.../examples/ScalarContinuationExample.scala | 2 +-
.../examples/ScalarCreditRiskExample.scala | 2 +-
.../examples/ScalarPiCalculationExample.scala | 2 +-
.../scalar/examples/ScalarPingPongExample.scala | 2 +-
.../scalar/examples/ScalarPrimeExample.scala | 2 +-
.../scalar/examples/ScalarScheduleExample.scala | 2 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 2 +-
.../scalar/examples/ScalarTaskExample.scala | 2 +-
.../examples/ScalarWorldShortestMapReduce.scala | 2 +-
.../GridMonteCarloExamplesSelfTest.java | 4 +-
.../testsuites/IgniteExamplesSelfTestSuite.java | 2 +-
.../ScalarExamplesSelfTestSuite.scala | 2 +-
modules/aop/readme.txt | 2 +-
.../GridifySetToXXXNonSpringAopSelfTest.java | 20 +-
.../GridifySetToXXXSpringAopSelfTest.java | 20 +-
.../ignite/gridify/NonSpringAopSelfTest.java | 20 +-
.../optimized/OptimizedMarshallerAopTest.java | 4 +-
.../testsuites/IgniteAopSelfTestSuite.java | 2 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 20 +-
modules/aws/readme.txt | 2 +-
modules/clients/src/test/bin/start-nodes-ssh.sh | 2 +-
modules/clients/src/test/bin/start-nodes.cmd | 24 +-
modules/clients/src/test/bin/start-nodes.sh | 34 +-
.../client/ClientDefaultCacheSelfTest.java | 4 +-
.../client/ClientTopologyCacheSelfTest.java | 2 +-
.../integration/ClientAbstractSelfTest.java | 6 +-
.../client/router/ClientFailedInitSelfTest.java | 4 +-
.../client/router/RouterFactorySelfTest.java | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 2 +-
.../rest/TaskCommandHandlerSelfTest.java | 4 +-
.../protocols/tcp/TcpRestParserSelfTest.java | 6 +-
.../src/test/resources/jetty/rest-jetty-ssl.xml | 10 +-
.../src/test/resources/jetty/rest-jetty.xml | 8 +-
.../test/resources/jetty/router-jetty-ssl.xml | 8 +-
.../src/test/resources/jetty/router-jetty.xml | 8 +-
modules/clients/src/test/resources/log4j.xml | 4 +-
.../clients/src/test/resources/spring-cache.xml | 2 +-
.../src/test/resources/spring-router-ssl.xml | 4 +-
.../src/test/resources/spring-router.xml | 4 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../apache/ignite/IgniteBasicWarmupClosure.java | 6 +-
.../java/org/apache/ignite/IgniteCluster.java | 6 +-
.../main/java/org/apache/ignite/IgniteFs.java | 4 +-
.../java/org/apache/ignite/IgniteLogger.java | 6 +-
.../apache/ignite/IgniteSystemProperties.java | 192 +-
.../main/java/org/apache/ignite/Ignition.java | 16 +-
.../apache/ignite/cache/CacheConfiguration.java | 3 +-
.../CacheConsistentHashAffinityFunction.java | 2 +-
.../apache/ignite/cache/query/CacheQuery.java | 3 +-
.../cache/query/CacheQuerySqlFunction.java | 4 +-
.../cache/query/annotations/QuerySqlField.java | 2 +-
.../query/annotations/QuerySqlFunction.java | 2 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +-
.../apache/ignite/client/GridClientCompute.java | 8 +-
.../ignite/client/router/GridRouterFactory.java | 4 +-
.../impl/GridRouterCommandLineStartup.java | 4 +-
.../router/impl/GridTcpRouterNioParser.java | 4 +-
.../apache/ignite/compute/gridify/Gridify.java | 2 +-
.../ignite/compute/gridify/GridifySetToSet.java | 4 +-
.../compute/gridify/GridifySetToValue.java | 4 +-
.../ClientConnectionConfiguration.java | 16 +-
.../configuration/GridQueryConfiguration.java | 201 -
.../configuration/IgniteConfiguration.java | 80 +-
.../configuration/IgniteDeploymentMode.java | 4 +-
.../configuration/IgniteQueryConfiguration.java | 201 +
.../apache/ignite/fs/IgniteFsConfiguration.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../apache/ignite/internal/GridLoggerProxy.java | 4 +-
.../internal/GridPerformanceSuggestions.java | 4 +-
.../apache/ignite/internal/GridProductImpl.java | 2 +-
.../ignite/internal/IgniteInternalFuture.java | 8 +-
.../apache/ignite/internal/IgniteKernal.java | 32 +-
.../org/apache/ignite/internal/IgnitionEx.java | 54 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../GridCachePartitionExchangeManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 4 +-
.../processors/cache/GridCacheUtils.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../distributed/near/GridNearGetFuture.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 10 +-
.../processors/fs/IgniteFsProcessor.java | 8 +-
.../processors/job/GridJobProcessor.java | 2 +-
.../jobmetrics/GridJobMetricsProcessor.java | 4 +-
.../handlers/log/GridLogCommandHandler.java | 4 +-
.../handlers/task/GridTaskCommandHandler.java | 2 +-
.../protocols/tcp/GridClientPacketType.java | 4 +-
.../protocols/tcp/GridMemcachedMessage.java | 4 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 18 +-
.../streamer/GridStreamProcessor.java | 6 +-
.../internal/util/GridConcurrentFactory.java | 3 +-
.../internal/util/GridConfigurationFinder.java | 4 +-
.../internal/util/GridReflectionCache.java | 3 +-
.../ignite/internal/util/IgniteUtils.java | 50 +-
.../util/future/GridFinishedFuture.java | 2 +-
.../internal/util/future/GridFutureAdapter.java | 4 +-
.../internal/util/io/GridUnsafeDataInput.java | 2 +-
.../internal/util/io/GridUnsafeDataOutput.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 4 +-
.../util/ipc/shmem/IpcSharedMemorySpace.java | 2 +-
.../internal/util/nio/GridBufferedParser.java | 2 +-
.../nio/GridConnectionBytesVerifyFilter.java | 18 +-
.../util/nodestart/GridNodeStartUtils.java | 10 +-
.../util/offheap/unsafe/GridUnsafeMemory.java | 2 +-
.../util/portscanner/GridJmxPortFinder.java | 4 +-
.../apache/ignite/internal/util/typedef/X.java | 4 +-
.../visor/node/VisorBasicConfiguration.java | 26 +-
.../visor/node/VisorEmailConfiguration.java | 14 +-
.../visor/node/VisorLifecycleConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 4 +-
.../apache/ignite/jdbc/IgniteJdbcDriver.java | 2 +-
.../apache/ignite/lifecycle/LifecycleBean.java | 4 +-
.../ignite/logger/java/IgniteJavaLogger.java | 4 +-
.../java/IgniteJavaLoggerFileHandler.java | 4 +-
.../optimized/IgniteOptimizedMarshaller.java | 2 +-
.../segmentation/GridSegmentationPolicy.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +-
.../ignite/spi/IgniteSpiManagementMBean.java | 2 +-
.../ignite/spi/checkpoint/CheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 12 +-
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 4 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../TcpDiscoveryMulticastIpFinder.java | 18 +-
.../sharedfs/TcpDiscoverySharedFsIpFinder.java | 2 +-
.../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../ignite/startup/BasicWarmupClosure.java | 6 +-
.../startup/cmdline/CommandLineStartup.java | 18 +-
.../startup/cmdline/CommandLineTransformer.java | 8 +-
.../ignite/thread/IgniteThreadFactory.java | 2 +-
.../apache/ignite/transactions/IgniteTx.java | 2 +-
.../core/src/test/bin/start-nodes-custom.bat | 2 +-
modules/core/src/test/bin/start-nodes-custom.sh | 2 +-
.../spring-cache-client-benchmark-1.xml | 2 +-
.../spring-cache-client-benchmark-2.xml | 2 +-
.../spring-cache-client-benchmark-3.xml | 2 +-
modules/core/src/test/config/example-cache.xml | 2 +-
modules/core/src/test/config/ggfs-loopback.xml | 2 +-
modules/core/src/test/config/ggfs-shmem.xml | 2 +-
modules/core/src/test/config/log4j-test.xml | 2 +-
.../core/src/test/config/spring-cache-load.xml | 2 +-
.../core/src/test/config/spring-multicache.xml | 2 +-
.../average/spring-streamer-average-base.xml | 2 +-
.../average/spring-streamer-average-local.xml | 2 +-
.../average/spring-streamer-average-random.xml | 2 +-
.../config/streamer/spring-streamer-base.xml | 2 +-
modules/core/src/test/config/tests.properties | 10 +-
.../internal/GridFactoryVmShutdownTest.java | 2 +-
.../ignite/internal/GridHomePathSelfTest.java | 2 +-
.../GridNodeVisorAttributesSelfTest.java | 4 +-
.../ignite/internal/GridStartStopSelfTest.java | 2 +-
.../ignite/internal/GridVersionSelfTest.java | 8 +-
.../GridCacheAbstractRemoveFailureTest.java | 6 +-
.../GridCacheMissingCommitVersionSelfTest.java | 6 +-
.../cache/GridCacheSlowTxWarnTest.java | 2 +-
...idCacheValueConsistencyAbstractSelfTest.java | 6 +-
.../GridCacheMultiNodeDataStructureTest.java | 4 +-
.../GridCacheNodeFailureAbstractTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 6 +-
...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +-
...tartupWithUndefinedGridGainHomeSelfTest.java | 6 +-
...GridUnsafeDataOutputArraySizingSelfTest.java | 2 +-
.../loadtest/GridSingleExecutionTest.java | 4 +-
.../cache/GridCacheAbstractLoadTest.java | 2 +-
.../cache/GridCacheDataStructuresLoadTest.java | 2 +-
.../loadtests/cache/GridCacheLoadTest.java | 2 +-
.../capacity/spring-capacity-cache.xml | 2 +-
.../loadtests/colocation/spring-colocation.xml | 2 +-
.../GridContinuousOperationsLoadTest.java | 18 +-
.../loadtests/mapper/GridNodeStartup.java | 4 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
.../streamer/GridStreamerIndexLoadTest.java | 2 +-
.../ignite/loadtests/util/GridLoadTestArgs.java | 8 +-
.../startup/GridRandomCommandLineLoader.java | 10 +-
.../ignite/startup/GridVmNodesStarter.java | 8 +-
.../GridCommandLineTransformerSelfTest.java | 6 +-
.../ignite/testframework/GridTestUtils.java | 10 +-
.../config/GridTestProperties.java | 16 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../logger/GridLog4jRollingFileAppender.java | 4 +-
.../junits/logger/GridTestLog4jLogger.java | 8 +-
.../src/test/resources/log/gridgain.log.tst | 13706 -----------------
.../core/src/test/resources/log/ignite.log.tst | 13706 +++++++++++++++++
.../core/src/test/webapp/META-INF/gg-config.xml | 2 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 2 +-
modules/email/readme.txt | 2 +-
modules/hadoop/readme.txt | 2 +-
.../fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 6 +-
.../fs/hadoop/v2/GridGgfsHadoopFileSystem.java | 6 +-
.../apache/ignite/hadoop/GridHadoopSetup.java | 16 +-
.../GridHadoopExternalTaskExecutor.java | 2 +-
.../child/GridHadoopExternalProcessStarter.java | 2 +-
.../hadoop/GridHadoopPopularWordsTest.java | 6 +-
modules/hibernate/readme.txt | 2 +-
.../hibernate/CacheHibernateBlobStore.java | 593 +
.../CacheHibernateBlobStoreEntry.hbm.xml | 29 +
.../hibernate/CacheHibernateBlobStoreEntry.java | 86 +
.../hibernate/GridCacheHibernateBlobStore.java | 593 -
.../GridCacheHibernateBlobStoreEntry.hbm.xml | 29 -
.../GridCacheHibernateBlobStoreEntry.java | 86 -
...idHibernateL2CacheTransactionalSelfTest.java | 2 +-
.../CacheHibernateBlobStoreSelfTest.java | 108 +
.../GridCacheHibernateBlobStoreSelfTest.java | 108 -
.../cache/store/hibernate/hibernate.cfg.xml | 2 +-
.../testsuites/IgniteHibernateTestSuite.java | 2 +-
modules/indexing/readme.txt | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 2 +-
.../GridCacheQueryMultiThreadedSelfTest.java | 2 +-
.../query/h2/sql/GridQueryParsingTest.java | 2 +-
modules/jcl/readme.txt | 2 +-
.../apache/ignite/logger/jcl/GridJclLogger.java | 4 +-
modules/jta/readme.txt | 2 +-
.../apache/ignite/cache/jta/CacheTmLookup.java | 50 +
.../ignite/cache/jta/GridCacheTmLookup.java | 50 -
.../cache/jta/jndi/CacheJndiTmLookup.java | 74 +
.../cache/jta/jndi/GridCacheJndiTmLookup.java | 74 -
.../jta/reflect/CacheReflectionTmLookup.java | 115 +
.../reflect/GridCacheReflectionTmLookup.java | 115 -
.../processors/cache/jta/CacheJtaManager.java | 4 +-
...CacheJtaConfigurationValidationSelfTest.java | 2 +-
.../processors/cache/GridCacheJtaSelfTest.java | 2 +-
.../GridTmLookupLifecycleAwareSelfTest.java | 4 +-
modules/log4j/readme.txt | 2 +-
.../ignite/logger/log4j/IgniteLog4jLogger.java | 8 +-
.../logger/log4j/IgniteLog4jNodeIdFilePath.java | 8 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 4 +-
modules/rest-http/readme.txt | 2 +-
.../http/jetty/GridJettyRestProtocol.java | 16 +-
.../rest/protocols/http/jetty/rest.html | 6 +-
modules/scalar/pom.xml | 6 +-
modules/scalar/readme.txt | 2 +-
modules/schedule/readme.txt | 2 +-
.../processors/schedule/ScheduleFutureImpl.java | 4 +-
modules/slf4j/readme.txt | 2 +-
modules/spring/readme.txt | 2 +-
.../java/org/apache/ignite/IgniteSpring.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 6 +-
.../spring/IgniteSpringProcessorImpl.java | 10 +-
.../ignite/internal/GridFactorySelfTest.java | 2 +-
modules/ssh/readme.txt | 2 +-
.../util/nodestart/GridNodeCallableImpl.java | 20 +-
.../internal/GridNodeStartUtilsSelfTest.java | 6 +-
.../GridProjectionStartStopRestartSelfTest.java | 4 +-
.../ignite/tools/javadoc/GridLinkTaglet.java | 165 -
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 165 +
.../optimized/OptimizedClassNamesGenerator.java | 12 +-
modules/urideploy/readme.txt | 2 +-
.../uri/GridUriDeploymentFileProcessor.java | 2 +-
.../deployment/uri/GridUriDeploymentSpi.java | 1367 --
.../uri/GridUriDeploymentSpiMBean.java | 53 -
.../spi/deployment/uri/UriDeploymentSpi.java | 1367 ++
.../deployment/uri/UriDeploymentSpiMBean.java | 53 +
.../GridTaskUriDeploymentDeadlockSelfTest.java | 2 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +-
.../uri/GridUriDeploymentAbstractSelfTest.java | 2 +-
.../GridUriDeploymentClassLoaderSelfTest.java | 2 +-
...riDeploymentClassloaderRegisterSelfTest.java | 4 +-
.../uri/GridUriDeploymentConfigSelfTest.java | 10 +-
.../GridUriDeploymentFileProcessorSelfTest.java | 2 +-
.../uri/GridUriDeploymentMd5CheckSelfTest.java | 2 +-
...loymentMultiScannersErrorThrottlingTest.java | 2 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../uri/GridUriDeploymentSimpleSelfTest.java | 10 +-
.../file/GridFileDeploymentSelfTest.java | 6 +-
.../GridFileDeploymentUndeploySelfTest.java | 8 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
.../IgniteUriDeploymentTestSuite.java | 3 +-
.../scala/org/apache/ignite/visor/Packet.scala | 2 +-
.../ignite/visor/commands/deploy/Packet.scala | 4 +-
.../commands/deploy/VisorDeployCommand.scala | 18 +-
.../ignite/visor/commands/start/Packet.scala | 6 +-
.../commands/start/VisorStartCommand.scala | 12 +-
.../scala/org/apache/ignite/visor/visor.scala | 14 +-
.../testsuites/VisorConsoleSelfTestSuite.scala | 2 +-
modules/web/readme.txt | 2 +-
.../cache/websession/GridWebSessionFilter.java | 26 +-
.../GridServletContextListenerStartup.java | 181 -
.../startup/servlet/GridServletStartup.java | 187 -
.../IgniteServletContextListenerStartup.java | 181 +
.../startup/servlet/IgniteServletStartup.java | 187 +
.../internal/websession/WebSessionSelfTest.java | 8 +-
.../websession/WebSessionServerStart.java | 2 +-
modules/yardstick/README.md | 67 +
.../config/benchmark-atomic-win.properties | 42 +
.../config/benchmark-atomic.properties | 48 +
.../config/benchmark-compute-win.properties | 45 +
.../config/benchmark-compute.properties | 51 +
.../config/benchmark-query-win.properties | 43 +
.../yardstick/config/benchmark-query.properties | 49 +
.../config/benchmark-tx-win.properties | 42 +
.../yardstick/config/benchmark-tx.properties | 48 +
.../yardstick/config/benchmark-win.properties | 50 +
modules/yardstick/config/benchmark.properties | 61 +
modules/yardstick/config/ignite-base-config.xml | 118 +
.../config/ignite-localhost-config.xml | 55 +
.../config/ignite-multicast-config.xml | 38 +
modules/yardstick/pom.xml | 185 +
.../yardstick/IgniteAbstractBenchmark.java | 130 +
.../yardstick/IgniteBenchmarkArguments.java | 213 +
.../org/apache/ignite/yardstick/IgniteNode.java | 191 +
.../cache/IgniteCacheAbstractBenchmark.java | 44 +
.../yardstick/cache/IgniteGetBenchmark.java | 41 +
.../yardstick/cache/IgnitePutBenchmark.java | 42 +
.../yardstick/cache/IgnitePutGetBenchmark.java | 47 +
.../cache/IgnitePutGetTxBenchmark.java | 52 +
.../yardstick/cache/IgnitePutTxBenchmark.java | 43 +
.../cache/IgniteSqlQueryBenchmark.java | 94 +
.../cache/IgniteSqlQueryJoinBenchmark.java | 118 +
.../cache/IgniteSqlQueryPutBenchmark.java | 86 +
.../yardstick/cache/model/Organization.java | 110 +
.../ignite/yardstick/cache/model/Person.java | 191 +
.../yardstick/cache/model/SampleValue.java | 62 +
.../compute/IgniteAffinityCallBenchmark.java | 36 +
.../yardstick/compute/IgniteApplyBenchmark.java | 72 +
.../compute/IgniteBroadcastBenchmark.java | 35 +
.../compute/IgniteExecuteBenchmark.java | 35 +
.../yardstick/compute/IgniteRunBenchmark.java | 71 +
.../yardstick/compute/model/NoopCallable.java | 41 +
.../yardstick/compute/model/NoopTask.java | 97 +
pom.xml | 35 +-
425 files changed, 21889 insertions(+), 19106 deletions(-)
----------------------------------------------------------------------