ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-683-2
Date Fri, 10 Apr 2015 12:44:46 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-683-2


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce989dd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce989dd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce989dd7

Branch: refs/heads/ignite-683-2
Commit: ce989dd731f8c09e47e59f3f30b20448dd02e6fe
Parents: 51416e9 60640de
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Apr 10 15:32:13 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Apr 10 15:32:13 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   4 +-
 assembly/release-hadoop.xml                     |   4 -
 bin/ignitevisorcmd.bat                          |  39 +-
 .../examples/MessagingExamplesSelfTest.java     |   2 +-
 .../java8/examples/BasicExamplesSelfTest.java   |   3 +
 .../java8/examples/CacheExamplesSelfTest.java   |   4 +
 .../examples/CheckpointExamplesSelfTest.java    |   3 +
 .../examples/ClusterGroupExampleSelfTest.java   |   3 +-
 .../examples/ContinuationExamplesSelfTest.java  |   3 +
 .../ContinuousMapperExamplesSelfTest.java       |   4 +-
 .../DeploymentExamplesMultiNodeSelfTest.java    |   2 +
 .../examples/DeploymentExamplesSelfTest.java    |   2 +
 .../HibernateL2CacheExampleSelfTest.java        |   3 +
 .../java8/examples/IgfsExamplesSelfTest.java    |   3 +
 .../examples/LifecycleExamplesSelfTest.java     |   3 +
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |   2 +
 .../examples/MemcacheRestExamplesSelfTest.java  |   2 +
 .../examples/MessagingExamplesSelfTest.java     |   4 +-
 .../examples/MonteCarloExamplesSelfTest.java    |   3 +
 .../examples/SpringBeanExamplesSelfTest.java    |   3 +
 .../java8/examples/TaskExamplesSelfTest.java    |   2 +
 .../client/ClientReconnectionSelfTest.java      |  67 +--
 .../ignite/codegen/MessageCodeGenerator.java    |   1 -
 modules/core/pom.xml                            |   2 +-
 .../java/org/apache/ignite/IgniteCache.java     |  24 +-
 .../java/org/apache/ignite/IgniteCluster.java   |   2 +-
 .../java/org/apache/ignite/IgniteState.java     |   2 +-
 .../configuration/CacheConfiguration.java       |  69 +--
 .../configuration/IgniteConfiguration.java      |  35 +-
 .../internal/ComputeTaskInternalFuture.java     |   2 +-
 .../ignite/internal/GridJobExecuteRequest.java  |  10 +-
 .../ignite/internal/GridJobExecuteResponse.java |   4 +-
 .../ignite/internal/GridPluginContext.java      |  15 +-
 .../apache/ignite/internal/GridTaskMessage.java |  30 --
 .../ignite/internal/GridTaskSessionRequest.java |   6 +-
 .../apache/ignite/internal/IgniteKernal.java    |  16 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../ignite/internal/MarshallerContextImpl.java  |   3 +
 .../client/GridClientConfiguration.java         |  14 +-
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../router/GridTcpRouterConfiguration.java      |   6 +-
 .../internal/cluster/ClusterGroupAdapter.java   | 150 +++++-
 .../internal/managers/GridManagerAdapter.java   |   4 +-
 .../discovery/GridDiscoveryManager.java         |  32 +-
 .../eventstorage/GridEventStorageManager.java   |   4 +-
 .../affinity/GridAffinityProcessor.java         |   5 +-
 .../processors/cache/CacheMetricsImpl.java      |   7 +-
 .../processors/cache/CacheMetricsSnapshot.java  | 223 ++++++++-
 .../processors/cache/GridCacheAdapter.java      |  39 +-
 .../processors/cache/GridCacheContext.java      |  64 ++-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../cache/GridCacheExplicitLockSpan.java        |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   6 +-
 .../processors/cache/GridCacheMvcc.java         |   2 +-
 .../cache/GridCacheMvccCandidate.java           |  50 +-
 .../processors/cache/GridCacheMvccManager.java  |  44 +-
 .../processors/cache/GridCacheProcessor.java    |  89 ++--
 .../cache/GridCacheProjectionImpl.java          |   2 +-
 .../processors/cache/GridCacheProxyImpl.java    |   2 +-
 .../processors/cache/IgniteCacheProxy.java      |  26 +
 .../distributed/GridDistributedCacheEntry.java  |  12 +-
 .../distributed/dht/GridDhtCacheEntry.java      |  36 +-
 .../distributed/dht/GridDhtLockFuture.java      |  18 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  14 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |  22 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   2 +
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  30 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  28 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   6 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  35 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  46 +-
 .../GridDhtPartitionsExchangeFuture.java        |  39 +-
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |  10 +-
 .../distributed/near/GridNearLockFuture.java    |  13 +-
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../near/GridNearTxFinishFuture.java            |   8 +-
 .../cache/distributed/near/GridNearTxLocal.java |   7 +
 .../near/GridNearTxPrepareFuture.java           | 122 +++--
 .../near/GridNearTxPrepareRequest.java          |  64 ++-
 .../local/atomic/GridLocalAtomicCache.java      |   6 +-
 .../cache/query/GridCacheQueriesImpl.java       |   2 +-
 .../cache/query/GridCacheQueryAdapter.java      |   2 +-
 .../continuous/CacheContinuousQueryManager.java |  30 +-
 .../cache/transactions/IgniteTxAdapter.java     |   3 +-
 .../cache/transactions/IgniteTxHandler.java     | 120 +++--
 .../transactions/IgniteTxLocalAdapter.java      |  82 ++--
 .../cache/transactions/IgniteTxManager.java     |   7 +
 .../cache/version/GridCacheVersionEx.java       |   2 +-
 .../cacheobject/IgniteCacheObjectProcessor.java |   5 +-
 .../IgniteCacheObjectProcessorImpl.java         |  36 +-
 .../datastreamer/DataStreamerImpl.java          |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |   2 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |   4 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |   4 +-
 .../processors/igfs/IgfsFileWorker.java         | 180 -------
 .../processors/igfs/IgfsFileWorkerBatch.java    | 225 ++++-----
 .../processors/igfs/IgfsFileWorkerTask.java     |  32 --
 .../internal/processors/igfs/IgfsImpl.java      | 150 +++---
 .../internal/processors/igfs/IgfsProcessor.java |   2 +-
 .../plugin/IgnitePluginProcessor.java           |  58 +--
 .../processors/rest/GridRestProcessor.java      |  33 +-
 .../security/GridSecurityProcessor.java         |  13 +-
 .../processors/security/SecurityContext.java    |   8 +-
 .../security/os/GridOsSecurityProcessor.java    |  11 +-
 .../processors/task/GridTaskProcessor.java      |   9 +-
 .../internal/util/future/GridFutureAdapter.java |  20 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   2 +-
 .../ignite/internal/util/worker/GridWorker.java |   6 +-
 .../visor/cache/VisorCacheClearTask.java        |   3 +
 .../cache/VisorCacheQueryConfiguration.java     |   9 -
 .../internal/visor/log/VisorLogSearchTask.java  |  12 +-
 .../node/VisorNodeEventsCollectorTask.java      |   3 +
 .../node/VisorSegmentationConfiguration.java    |   4 +-
 .../internal/visor/util/VisorTaskUtils.java     |   3 +
 .../ignite/plugin/CachePluginConfiguration.java |   2 +-
 .../org/apache/ignite/plugin/IgnitePlugin.java  |   3 -
 .../ignite/plugin/PluginConfiguration.java      |  10 +-
 .../org/apache/ignite/plugin/PluginContext.java |   7 +-
 .../apache/ignite/plugin/PluginProvider.java    |   4 +-
 .../plugin/security/AuthenticationContext.java  |  12 +-
 .../security/GridSecurityCredentials.java       | 184 -------
 .../GridSecurityCredentialsBasicProvider.java   |  44 --
 .../GridSecurityCredentialsProvider.java        |  44 --
 .../plugin/security/GridSecurityException.java  |  58 ---
 .../plugin/security/GridSecurityPermission.java |  69 ---
 .../security/GridSecurityPermissionSet.java     |  66 ---
 .../plugin/security/GridSecuritySubject.java    |  62 ---
 .../security/GridSecuritySubjectType.java       |  48 --
 .../plugin/security/SecurityCredentials.java    | 191 ++++++++
 .../SecurityCredentialsBasicProvider.java       |  44 ++
 .../security/SecurityCredentialsProvider.java   |  44 ++
 .../plugin/security/SecurityException.java      |  61 +++
 .../plugin/security/SecurityPermission.java     |  69 +++
 .../plugin/security/SecurityPermissionSet.java  |  66 +++
 .../ignite/plugin/security/SecuritySubject.java |  62 +++
 .../plugin/security/SecuritySubjectType.java    |  48 ++
 .../segmentation/GridSegmentationPolicy.java    |  47 --
 .../segmentation/GridSegmentationResolver.java  |  64 ---
 .../plugin/segmentation/SegmentationPolicy.java |  49 ++
 .../segmentation/SegmentationResolver.java      |  65 +++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   4 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   4 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |  10 +
 .../DiscoverySpiNodeAuthenticator.java          |   2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  35 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  57 ++-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../tcp/internal/TcpDiscoveryNode.java          |  76 ++-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  65 +++
 .../startup/cmdline/CommandLineStartup.java     |   7 +-
 .../GridCacheAffinityBackupsSelfTest.java       |  15 +-
 .../internal/GridLifecycleAwareSelfTest.java    |   2 +-
 .../ignite/internal/GridProjectionSelfTest.java |  82 ++++
 .../ignite/internal/GridStartStopSelfTest.java  |   8 +-
 .../CacheMetricsForClusterGroupSelfTest.java    | 236 +++++++++
 .../cache/GridCacheAbstractFullApiSelfTest.java |  13 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |   3 +-
 .../cache/GridCacheAbstractSelfTest.java        |  10 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |   4 +-
 .../cache/GridCacheClearAllSelfTest.java        |   2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   9 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |  42 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   4 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |  23 +-
 .../cache/GridCacheReloadSelfTest.java          |   3 +-
 .../GridCacheReturnValueTransferSelfTest.java   |  15 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |   5 +-
 .../cache/IgniteCachePeekModesAbstractTest.java |  40 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |   5 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |   5 +-
 .../GridCacheSetAbstractSelfTest.java           |  10 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../distributed/GridCacheEventAbstractTest.java |  16 +-
 .../GridCacheMultiNodeAbstractTest.java         |  13 +-
 .../GridCacheNodeFailureAbstractTest.java       |  15 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  12 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   2 +-
 .../dht/IgniteCacheLockFailoverSelfTest.java    | 156 ++++++
 .../dht/IgniteCacheMultiTxLockSelfTest.java     | 219 +++++++++
 .../near/GridCacheNearMultiNodeSelfTest.java    |  26 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   2 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   6 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |   4 +-
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |   2 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   5 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  23 +-
 .../continuous/GridEventConsumeSelfTest.java    |   7 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  24 +-
 .../tostring/GridToStringBuilderSelfTest.java   |   5 +-
 .../GridP2PMissedResourceCacheSizeSelfTest.java |   2 +-
 .../tcp/TcpClientDiscoverySelfTest.java         |   5 +-
 .../testframework/GridSpiTestContext.java       |   4 +-
 .../testframework/junits/GridAbstractTest.java  |   6 +-
 .../junits/common/GridCommonAbstractTest.java   |  13 +-
 .../junits/spi/GridSpiAbstractTest.java         |  72 +--
 .../IgniteCacheMetricsSelfTestSuite.java        |   4 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   3 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |   2 +
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |   4 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   2 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  24 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  10 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   5 +-
 ...CacheOffheapTieredMultithreadedSelfTest.java |   4 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |   2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |   3 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |   5 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |  18 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |  14 +-
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  12 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   1 +
 .../processors/cache/GridCacheJtaSelfTest.java  |   6 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |   8 +-
 .../ignite/tools/classgen/ClassesGenerator.java |   2 +-
 .../ignite/tools/javadoc/IgniteLinkTaglet.java  |  20 +-
 modules/urideploy/README.txt                    |   2 +-
 modules/urideploy/licenses/edtftp-license.pdf   | Bin 58355 -> 0 bytes
 modules/urideploy/licenses/jtidy-license.txt    |  50 --
 .../urideploy/licenses/jtidy-mit-license.txt    |  50 ++
 modules/urideploy/pom.xml                       |   6 -
 .../spi/deployment/uri/UriDeploymentSpi.java    | 182 +++----
 .../uri/scanners/GridUriDeploymentScanner.java  | 286 -----------
 .../GridUriDeploymentScannerListener.java       |   2 +-
 .../uri/scanners/UriDeploymentScanner.java      |  47 ++
 .../scanners/UriDeploymentScannerContext.java   |  92 ++++
 .../scanners/UriDeploymentScannerManager.java   | 221 +++++++++
 .../file/GridUriDeploymentFileScanner.java      | 311 ------------
 .../scanners/file/UriDeploymentFileScanner.java | 327 +++++++++++++
 .../ftp/GridUriDeploymentFtpClient.java         | 199 --------
 .../ftp/GridUriDeploymentFtpConfiguration.java  | 115 -----
 .../ftp/GridUriDeploymentFtpException.java      |  43 --
 .../scanners/ftp/GridUriDeploymentFtpFile.java  | 119 -----
 .../ftp/GridUriDeploymentFtpScanner.java        | 234 ---------
 .../uri/scanners/ftp/package-info.java          |  22 -
 .../http/GridUriDeploymentHttpScanner.java      | 423 ----------------
 .../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++++++++++
 ...loymentMultiScannersErrorThrottlingTest.java |   3 -
 .../GridUriDeploymentMultiScannersSelfTest.java |   3 +-
 .../GridFileDeploymentUndeploySelfTest.java     |   4 +-
 .../uri/scanners/ftp/GridFtpDeploymentTest.java |  46 --
 .../uri/scanners/ftp/package-info.java          |  22 -
 .../ignite/visor/commands/VisorConsole.scala    |  19 +
 .../scala/org/apache/ignite/visor/visor.scala   |   3 +
 246 files changed, 4950 insertions(+), 4159 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce989dd7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------


Mime
View raw message