You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/15 14:03:16 UTC
[48/50] [abbrv] ignite git commit: Merge remote-tracking branch
'origin/ignite-1486' into ignite-1282
Merge remote-tracking branch 'origin/ignite-1486' into ignite-1282
Conflicts:
modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
modules/platform/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
modules/platform/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetPortableConfiguration.java
modules/platform/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetPortableTypeConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/964414c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/964414c7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/964414c7
Branch: refs/heads/ignite-gg-10760
Commit: 964414c74b727347ed7c23f14d2af2c4c5e117c3
Parents: 56a1e33 e7eb2b3
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 15 11:01:05 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 15 11:01:05 2015 +0300
----------------------------------------------------------------------
examples/config/example-default.xml | 76 +
examples/config/example-ignite.xml | 56 +-
.../config/portable/example-ignite-portable.xml | 44 +
.../ignite/examples/portable/Address.java | 72 +
.../ignite/examples/portable/Employee.java | 93 +
.../ignite/examples/portable/EmployeeKey.java | 90 +
.../portable/ExamplePortableNodeStartup.java | 36 +
.../ignite/examples/portable/Organization.java | 93 +
.../examples/portable/OrganizationType.java | 32 +
...mputeClientPortableTaskExecutionExample.java | 154 +
.../portable/computegrid/ComputeClientTask.java | 116 +
.../portable/computegrid/package-info.java | 21 +
.../CacheClientPortablePutGetExample.java | 230 ++
.../CacheClientPortableQueryExample.java | 325 ++
.../portable/datagrid/package-info.java | 21 +
.../ignite/examples/portable/package-info.java | 21 +
.../CacheClientPortableExampleTest.java | 46 +
.../ComputeClientPortableExampleTest.java | 37 +
.../testsuites/IgniteExamplesSelfTestSuite.java | 6 +
modules/core/pom.xml | 21 +
.../src/main/java/org/apache/ignite/Ignite.java | 7 +
.../java/org/apache/ignite/IgniteCache.java | 44 +-
.../java/org/apache/ignite/IgnitePortables.java | 370 ++
.../configuration/CacheConfiguration.java | 70 +-
.../org/apache/ignite/internal/IgniteEx.java | 9 -
.../apache/ignite/internal/IgniteKernal.java | 8 +-
.../ignite/internal/IgniteNodeAttributes.java | 5 +-
.../discovery/GridDiscoveryManager.java | 10 +
.../portable/GridPortableMarshaller.java | 2 +-
.../portable/PortableClassDescriptor.java | 10 +-
.../internal/portable/PortableContext.java | 14 +-
.../portable/PortableMetaDataCollector.java | 6 +-
.../portable/PortableMetaDataHandler.java | 4 +-
.../internal/portable/PortableMetaDataImpl.java | 14 +-
.../internal/portable/PortableObjectEx.java | 6 +-
.../internal/portable/PortableObjectImpl.java | 6 +-
.../portable/PortableObjectOffheapImpl.java | 6 +-
.../internal/portable/PortableRawReaderEx.java | 4 +-
.../internal/portable/PortableRawWriterEx.java | 4 +-
.../portable/PortableReaderContext.java | 2 +-
.../internal/portable/PortableReaderExImpl.java | 10 +-
.../ignite/internal/portable/PortableUtils.java | 2 +-
.../internal/portable/PortableWriterExImpl.java | 11 +-
.../internal/portable/api/IgnitePortables.java | 362 --
.../internal/portable/api/PortableBuilder.java | 136 -
.../portable/api/PortableException.java | 57 -
.../internal/portable/api/PortableIdMapper.java | 54 -
.../api/PortableInvalidClassException.java | 58 -
.../portable/api/PortableMarshalAware.java | 48 -
.../portable/api/PortableMarshaller.java | 358 --
.../internal/portable/api/PortableMetadata.java | 60 -
.../internal/portable/api/PortableObject.java | 152 -
.../portable/api/PortableProtocolVersion.java | 41 -
.../portable/api/PortableRawReader.java | 234 --
.../portable/api/PortableRawWriter.java | 219 -
.../internal/portable/api/PortableReader.java | 284 --
.../portable/api/PortableSerializer.java | 47 -
.../portable/api/PortableTypeConfiguration.java | 195 -
.../internal/portable/api/PortableWriter.java | 266 --
.../portable/builder/PortableBuilderEnum.java | 2 +-
.../portable/builder/PortableBuilderImpl.java | 14 +-
.../portable/builder/PortableBuilderReader.java | 2 +-
.../builder/PortableBuilderSerializer.java | 2 +-
.../builder/PortableEnumArrayLazyValue.java | 4 +-
.../builder/PortableObjectArrayLazyValue.java | 2 +-
.../builder/PortablePlainPortableObject.java | 2 +-
.../streams/PortableAbstractInputStream.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 8 +-
.../processors/cache/IgniteCacheProxy.java | 5 +
.../CacheDefaultPortableAffinityKeyMapper.java | 2 +-
.../portable/CacheObjectPortableContext.java | 2 +-
.../portable/CacheObjectPortableProcessor.java | 8 +-
.../CacheObjectPortableProcessorImpl.java | 12 +-
.../cache/portable/IgnitePortablesImpl.java | 10 +-
.../cache/store/CacheOsStoreManager.java | 4 +-
.../marshaller/portable/PortableMarshaller.java | 358 ++
.../marshaller/portable/package-info.java | 22 +
.../apache/ignite/portable/PortableBuilder.java | 137 +
.../ignite/portable/PortableException.java | 57 +
.../ignite/portable/PortableIdMapper.java | 56 +
.../portable/PortableInvalidClassException.java | 58 +
.../ignite/portable/PortableMarshalAware.java | 48 +
.../ignite/portable/PortableMetadata.java | 61 +
.../apache/ignite/portable/PortableObject.java | 154 +
.../portable/PortableProtocolVersion.java | 41 +
.../ignite/portable/PortableRawReader.java | 234 ++
.../ignite/portable/PortableRawWriter.java | 219 +
.../apache/ignite/portable/PortableReader.java | 284 ++
.../ignite/portable/PortableSerializer.java | 49 +
.../portable/PortableTypeConfiguration.java | 196 +
.../apache/ignite/portable/PortableWriter.java | 266 ++
.../apache/ignite/portable/package-info.java | 22 +
.../resources/META-INF/classnames.properties | 8 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 45 +
.../GridPortableAffinityKeySelfTest.java | 218 +
.../GridPortableBuilderAdditionalSelfTest.java | 1226 ++++++
.../portable/GridPortableBuilderSelfTest.java | 1021 +++++
...eBuilderStringAsCharsAdditionalSelfTest.java | 28 +
...ridPortableBuilderStringAsCharsSelfTest.java | 28 +
...idPortableMarshallerCtxDisabledSelfTest.java | 256 ++
.../GridPortableMarshallerSelfTest.java | 3807 ++++++++++++++++++
.../GridPortableMetaDataDisabledSelfTest.java | 238 ++
.../portable/GridPortableMetaDataSelfTest.java | 371 ++
.../portable/GridPortableWildcardsSelfTest.java | 482 +++
.../GridPortableMarshalerAwareTestClass.java | 67 +
.../mutabletest/GridPortableTestClasses.java | 434 ++
.../portable/mutabletest/package-info.java | 22 +
.../ignite/internal/portable/package-info.java | 22 +
.../portable/test/GridPortableTestClass1.java | 28 +
.../portable/test/GridPortableTestClass2.java | 24 +
.../internal/portable/test/package-info.java | 22 +
.../test/subpackage/GridPortableTestClass3.java | 24 +
.../portable/test/subpackage/package-info.java | 22 +
...ClientNodePortableMetadataMultinodeTest.java | 295 ++
...GridCacheClientNodePortableMetadataTest.java | 286 ++
...ableObjectsAbstractDataStreamerSelfTest.java | 190 +
...bleObjectsAbstractMultiThreadedSelfTest.java | 231 ++
...ridCachePortableObjectsAbstractSelfTest.java | 978 +++++
.../GridCachePortableStoreAbstractSelfTest.java | 297 ++
.../GridCachePortableStoreObjectsSelfTest.java | 55 +
...GridCachePortableStorePortablesSelfTest.java | 66 +
...ridPortableCacheEntryMemorySizeSelfTest.java | 55 +
...leDuplicateIndexObjectsAbstractSelfTest.java | 158 +
.../DataStreamProcessorPortableSelfTest.java | 66 +
.../GridDataStreamerImplSelfTest.java | 345 ++
...ridCacheAffinityRoutingPortableSelfTest.java | 47 +
...lyPortableDataStreamerMultiNodeSelfTest.java | 29 +
...rtableDataStreamerMultithreadedSelfTest.java | 47 +
...artitionedOnlyPortableMultiNodeSelfTest.java | 28 +
...tionedOnlyPortableMultithreadedSelfTest.java | 47 +
.../GridCacheMemoryModePortableSelfTest.java | 36 +
...acheOffHeapTieredAtomicPortableSelfTest.java | 47 +
...eapTieredEvictionAtomicPortableSelfTest.java | 95 +
...heOffHeapTieredEvictionPortableSelfTest.java | 95 +
.../GridCacheOffHeapTieredPortableSelfTest.java | 47 +
...ateIndexObjectPartitionedAtomicSelfTest.java | 38 +
...xObjectPartitionedTransactionalSelfTest.java | 41 +
...AtomicNearDisabledOffheapTieredSelfTest.java | 29 +
...rtableObjectsAtomicNearDisabledSelfTest.java | 51 +
...tableObjectsAtomicOffheapTieredSelfTest.java | 29 +
.../GridCachePortableObjectsAtomicSelfTest.java | 51 +
...tionedNearDisabledOffheapTieredSelfTest.java | 30 +
...eObjectsPartitionedNearDisabledSelfTest.java | 51 +
...ObjectsPartitionedOffheapTieredSelfTest.java | 30 +
...CachePortableObjectsPartitionedSelfTest.java | 51 +
...sNearPartitionedByteArrayValuesSelfTest.java | 41 +
...sPartitionedOnlyByteArrayValuesSelfTest.java | 42 +
...dCachePortableObjectsReplicatedSelfTest.java | 51 +
...CachePortableObjectsAtomicLocalSelfTest.java | 32 +
...rtableObjectsLocalOffheapTieredSelfTest.java | 29 +
.../GridCachePortableObjectsLocalSelfTest.java | 51 +
.../ignite/testframework/junits/IgniteMock.java | 8 +-
.../multijvm/IgniteCacheProcessProxy.java | 5 +
.../junits/multijvm/IgniteProcessProxy.java | 2 +-
.../IgnitePortableCacheFullApiTestSuite.java | 37 +
.../IgnitePortableCacheTestSuite.java | 103 +
.../IgnitePortableObjectsTestSuite.java | 92 +
.../ignite/portable/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes
.../ignite/portable/test1/1.1/test1-1.1.pom | 9 +
.../portable/test1/maven-metadata-local.xml | 12 +
.../ignite/portable/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes
.../ignite/portable/test2/1.1/test2-1.1.pom | 9 +
.../portable/test2/maven-metadata-local.xml | 12 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 6 -
.../IgnitePortableCacheQueryTestSuite.java | 117 +
.../platform/PlatformContextImpl.java | 4 +-
.../platform/compute/PlatformCompute.java | 2 +-
.../cpp/PlatformCppConfigurationClosure.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 5 +-
.../Config/Compute/compute-grid1.xml | 8 +-
.../PlatformComputePortableArgTask.java | 8 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 +
parent/pom.xml | 10 +
173 files changed, 17407 insertions(+), 2759 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/964414c7/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/964414c7/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/964414c7/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/964414c7/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------
diff --cc modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index 8fd0e7b,6e03dfe..03f04c0
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@@ -36,11 -36,10 +36,12 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lifecycle.LifecycleBean;
import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.internal.portable.api.PortableMarshaller;
+import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration;
+ import org.apache.ignite.marshaller.portable.PortableMarshaller;
import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean;
- import org.apache.ignite.internal.portable.api.PortableException;
- import org.apache.ignite.internal.portable.api.PortableMetadata;
+ import org.apache.ignite.portable.PortableException;
+ import org.apache.ignite.portable.PortableMetadata;
import java.util.ArrayList;
import java.util.Collections;