You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/02/02 22:56:59 UTC
[16/50] [abbrv] incubator-ignite git commit: Merge branch
'ignite-113' into sprint-1
Merge branch 'ignite-113' 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/5203363e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5203363e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5203363e
Branch: refs/heads/ignite-132
Commit: 5203363e7b1cd297032da02611f81f24cbe60e6c
Parents: 57f55f6 9e74899
Author: Artem SHutak <as...@gridgain.com>
Authored: Fri Jan 30 18:15:14 2015 +0300
Committer: Artem SHutak <as...@gridgain.com>
Committed: Fri Jan 30 18:15:14 2015 +0300
----------------------------------------------------------------------
examples/config/servlet/WEB-INF/web.xml | 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 +++
.../ignite/spi/checkpoint/CheckpointSpi.java | 2 +-
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../apache/ignite/transactions/IgniteTx.java | 2 +-
modules/core/src/test/webapp/WEB-INF/web.xml | 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 +-
.../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 +++
.../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 +-
.../cache/websession/GridWebSessionFilter.java | 4 +-
.../GridServletContextListenerStartup.java | 181 ---
.../startup/servlet/GridServletStartup.java | 187 ---
.../IgniteServletContextListenerStartup.java | 181 +++
.../startup/servlet/IgniteServletStartup.java | 187 +++
pom.xml | 6 +-
72 files changed, 3279 insertions(+), 3283 deletions(-)
----------------------------------------------------------------------