Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-211
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a1809fb8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1809fb8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1809fb8 Branch: refs/heads/ignite-211 Commit: a1809fb835c7086bbd47d1bfbd8f81c90f3c71ba Parents: 935a40d 7fb81d4 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Feb 10 13:13:32 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Feb 10 13:13:32 2015 +0300 ---------------------------------------------------------------------- .../client/ClientPortableArgumentTask.java | 52 -- .../ignite/client/ClientPutPortableTask.java | 43 -- .../ignite/client/ClientTestPortable.java | 490 ------------------- .../ClientTestPortableAffinityKeyTask.java | 85 ---- .../clients/src/test/resources/spring-cache.xml | 6 +- .../src/test/resources/spring-server-node.xml | 12 +- .../test/resources/spring-server-ssl-node.xml | 6 +- .../src/main/java/org/apache/ignite/Ignite.java | 7 - .../java/org/apache/ignite/IgniteCache.java | 2 +- .../java/org/apache/ignite/IgnitePortables.java | 364 -------------- .../apache/ignite/cache/CacheProjection.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 10 +- .../ignite/client/GridClientCacheFlag.java | 2 +- .../ignite/client/GridClientConfiguration.java | 23 - .../configuration/CacheConfiguration.java | 64 --- .../configuration/IgniteConfiguration.java | 19 - .../ignite/internal/GridKernalContextImpl.java | 6 + .../ignite/internal/GridPortablesImpl.java | 174 ------- .../apache/ignite/internal/IgniteKernal.java | 15 +- .../org/apache/ignite/internal/IgnitionEx.java | 3 - .../affinity/GridAffinityAssignmentCache.java | 3 +- .../affinity/GridAffinityProcessor.java | 2 +- .../processors/cache/GridCacheAdapter.java | 21 +- .../processors/cache/GridCacheAttributes.java | 11 - .../processors/cache/GridCacheContext.java | 125 +---- .../GridCacheDefaultAffinityKeyMapper.java | 34 +- .../GridCachePartitionExchangeManager.java | 18 +- .../processors/cache/GridCacheProcessor.java | 12 +- .../cache/GridCacheProjectionImpl.java | 12 +- .../processors/cache/GridCacheStoreManager.java | 4 +- .../IgniteCacheOsSerializationManager.java | 48 ++ .../cache/affinity/GridCacheAffinityImpl.java | 3 +- .../IgniteCacheSerializationManager.java | 51 ++ .../transactions/IgniteTxLocalAdapter.java | 7 +- .../dataload/IgniteDataLoaderImpl.java | 6 +- .../plugin/IgnitePluginProcessor.java | 4 +- .../portable/GridPortableProcessor.java | 88 ++-- .../portable/os/GridOsPortableProcessor.java | 48 +- .../processors/query/GridQueryProcessor.java | 33 +- .../processors/rest/GridRestProcessor.java | 10 +- .../message/GridClientAbstractMessage.java | 17 +- .../GridClientAuthenticationRequest.java | 19 - .../message/GridClientCacheQueryRequest.java | 45 -- .../client/message/GridClientCacheRequest.java | 48 -- .../message/GridClientGetMetaDataRequest.java | 64 --- .../client/message/GridClientLogRequest.java | 23 - .../message/GridClientMetaDataResponse.java | 57 --- .../rest/client/message/GridClientNodeBean.java | 40 +- .../message/GridClientNodeMetricsBean.java | 120 +---- .../message/GridClientPortableMetaData.java | 23 +- .../message/GridClientPutMetaDataRequest.java | 64 --- .../rest/client/message/GridClientResponse.java | 23 - .../client/message/GridClientTaskRequest.java | 28 -- .../message/GridClientTaskResultBean.java | 28 +- .../message/GridClientTopologyRequest.java | 25 - .../cache/GridCacheClientQueryResult.java | 24 +- .../metadata/GridPortableMetadataHandler.java | 103 ---- .../handlers/task/GridTaskCommandHandler.java | 3 +- .../protocols/tcp/GridTcpRestNioListener.java | 14 - .../GridRestPortableGetMetaDataRequest.java | 44 -- .../GridRestPortablePutMetaDataRequest.java | 44 -- .../ignite/internal/util/IgniteUtils.java | 73 --- .../util/portable/PortableRawReaderEx.java | 32 -- .../util/portable/PortableRawWriterEx.java | 43 -- .../visor/portable/VisorPortableMetadata.java | 72 --- .../VisorPortableMetadataCollectorTask.java | 94 ---- .../portable/VisorPortableMetadataField.java | 71 --- .../optimized/optimized-classnames.properties | 8 - .../apache/ignite/plugin/PluginProvider.java | 2 +- .../security/GridSecurityCredentials.java | 20 +- .../ignite/portables/PortableBuilder.java | 137 ------ .../ignite/portables/PortableConfiguration.java | 189 ------- .../ignite/portables/PortableException.java | 57 --- .../ignite/portables/PortableIdMapper.java | 55 --- .../PortableInvalidClassException.java | 58 --- .../ignite/portables/PortableMarshalAware.java | 48 -- .../ignite/portables/PortableMetadata.java | 61 --- .../apache/ignite/portables/PortableObject.java | 160 ------ .../ignite/portables/PortableRawReader.java | 235 --------- .../ignite/portables/PortableRawWriter.java | 218 --------- .../apache/ignite/portables/PortableReader.java | 286 ----------- .../ignite/portables/PortableSerializer.java | 47 -- .../portables/PortableTypeConfiguration.java | 195 -------- .../apache/ignite/portables/PortableWriter.java | 265 ---------- .../org/apache/ignite/portables/package.html | 24 - .../cache/GridCacheAbstractFullApiSelfTest.java | 38 +- .../cache/GridCacheAbstractSelfTest.java | 8 - .../cache/GridCacheAffinityMapperSelfTest.java | 17 + .../cache/GridCacheMemoryModeSelfTest.java | 8 - ...HeapMultiThreadedUpdateAbstractSelfTest.java | 1 - .../GridCacheOffHeapTieredAbstractSelfTest.java | 15 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 78 +-- .../cache/IgniteCacheAbstractTest.java | 8 - ...tractDistributedByteArrayValuesSelfTest.java | 10 - ...tractPartitionedByteArrayValuesSelfTest.java | 3 - .../dht/GridCacheAtomicFullApiSelfTest.java | 18 + ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 6 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 19 +- .../near/GridCachePartitionedLockSelfTest.java | 34 -- .../GridCacheSwapScanQueryAbstractSelfTest.java | 59 ++- .../query/GridCacheSwapScanQuerySelfTest.java | 4 - .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../ignite/testframework/junits/IgniteMock.java | 5 - .../org/apache/ignite/IgniteSpringBean.java | 7 - 104 files changed, 396 insertions(+), 5174 deletions(-) ----------------------------------------------------------------------
