Merge branch 'sprint-1' into ignite-140
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55dc1474 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55dc1474 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55dc1474 Branch: refs/heads/ignite-6 Commit: 55dc1474681c58872f58f79b14c642930cc93616 Parents: 2906481 5203363 Author: Artem SHutak <ashu...@gridgain.com> Authored: Fri Jan 30 19:48:57 2015 +0300 Committer: Artem SHutak <ashu...@gridgain.com> Committed: Fri Jan 30 19:48:57 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 6 +- examples/config/servlet/WEB-INF/web.xml | 2 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +- .../ClientPropertiesConfigurationSelfTest.java | 4 +- .../apache/ignite/IgniteCheckedException.java | 2 +- .../java/org/apache/ignite/IgniteException.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 6 +- .../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 +- .../ignite/compute/gridify/GridifySetToSet.java | 2 +- .../compute/gridify/GridifySetToValue.java | 2 +- .../configuration/GridQueryConfiguration.java | 201 - .../configuration/IgniteConfiguration.java | 8 +- .../configuration/IgniteQueryConfiguration.java | 201 + .../processors/cache/GridCacheAdapter.java | 16 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheMvccCandidate.java | 4 +- .../processors/cache/GridCacheStoreManager.java | 25 +- .../processors/cache/IgniteCacheProxy.java | 24 +- .../transactions/IgniteTxLocalAdapter.java | 42 +- .../service/GridServiceProcessor.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 9141 ------------------ .../ignite/internal/util/IgniteUtils.java | 9141 ++++++++++++++++++ .../internal/util/typedef/internal/U.java | 4 +- .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../internal/visor/query/VisorQueryUtils.java | 4 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 27 +- .../optimized/IgniteOptimizedMarshaller.java | 2 +- .../ignite/spi/checkpoint/CheckpointSpi.java | 2 +- .../ignite/spi/deployment/DeploymentSpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../apache/ignite/transactions/IgniteTx.java | 2 +- .../IgniteExceptionHelpLinksSelfTest.java | 3 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 10 +- .../GridCacheAbstractProjectionSelfTest.java | 50 + .../cache/GridCachePutAllFailoverSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../IgniteCrossCacheTxStoreSelfTest.java | 288 + ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 11 +- .../cache/GridCacheCommandHandlerSelfTest.java | 4 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +- .../internal/util/GridTestClockTimer.java | 6 +- .../ignite/internal/util/GridUtilsSelfTest.java | 728 -- .../internal/util/IgniteUtilsSelfTest.java | 728 ++ .../IpcSharedMemoryNativeLoaderSelfTest.java | 2 +- .../ignite/lang/GridSetWrapperSelfTest.java | 2 +- .../ignite/messaging/GridMessagingSelfTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- modules/core/src/test/webapp/WEB-INF/web.xml | 2 +- .../hadoop/GridHadoopClassLoader.java | 4 +- .../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 +- .../processors/query/h2/IgniteH2Indexing.java | 6 +- .../cache/GridCacheAbstractQuerySelfTest.java | 2 +- .../GridCacheQueryMultiThreadedSelfTest.java | 2 +- .../query/h2/sql/GridQueryParsingTest.java | 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 +- .../ignite/cache/spring/SpringCacheManager.java | 2 +- .../ignite/tools/javadoc/GridLinkTaglet.java | 165 - .../ignite/tools/javadoc/IgniteLinkTaglet.java | 165 + .../optimized/OptimizedClassNamesGenerator.java | 6 +- .../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 | 2 +- .../GridFileDeploymentUndeploySelfTest.java | 8 +- .../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +- .../http/GridHttpDeploymentSelfTest.java | 2 +- .../IgniteUriDeploymentTestSuite.java | 3 +- .../ignite/visor/commands/VisorConsole.scala | 6 +- .../commands/alert/VisorAlertCommand.scala | 2 +- .../config/VisorConfigurationCommand.scala | 6 +- .../commands/deploy/VisorDeployCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 4 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 13 +- .../visor/commands/node/VisorNodeCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 4 +- .../commands/top/VisorTopologyCommand.scala | 6 +- .../visor/commands/vvm/VisorVvmCommand.scala | 8 +- .../scala/org/apache/ignite/visor/visor.scala | 21 +- .../visor/commands/gc/VisorGcCommandSpec.scala | 25 +- .../cache/websession/GridWebSessionFilter.java | 4 +- .../GridServletContextListenerStartup.java | 181 - .../startup/servlet/GridServletStartup.java | 187 - .../IgniteServletContextListenerStartup.java | 181 + .../startup/servlet/IgniteServletStartup.java | 187 + pom.xml | 6 +- 128 files changed, 13680 insertions(+), 13314 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55dc1474/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55dc1474/pom.xml ----------------------------------------------------------------------
