http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java index c935b36..203ddb7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java @@ -9,8 +9,8 @@ package org.gridgain.grid.marshaller.optimized; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html b/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html deleted file mode 100644 index 0129583..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains various supported marshallers. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java index 3af3d65..aa0359d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java @@ -10,9 +10,9 @@ package org.gridgain.grid.spi.checkpoint.sharedfs; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java index 4e9174f..79f05a2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java @@ -10,8 +10,8 @@ package org.gridgain.grid.spi.checkpoint.sharedfs; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java index d668ffc..13689f3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java @@ -10,8 +10,8 @@ package org.gridgain.grid.spi.checkpoint.sharedfs; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java index f184747..9617000 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java @@ -13,10 +13,10 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.eventstorage.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.product.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.communication.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java index c5a7276..4bffc5e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java @@ -12,11 +12,11 @@ package org.gridgain.grid.spi.discovery.tcp; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.security.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java index 970d9d2..e8dd237 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java @@ -11,9 +11,9 @@ package org.gridgain.grid.spi.discovery.tcp; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.product.*; import org.gridgain.grid.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java index f525818..c0e460b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java @@ -10,9 +10,9 @@ package org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java index 1a6c044..d8eb600 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java @@ -9,7 +9,6 @@ package org.gridgain.grid.spi.indexing; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; import org.jetbrains.annotations.*; @@ -28,7 +27,7 @@ public class GridIndexingEntityAdapter<T> implements GridIndexingEntity<T> { /** * @param val Value. - * @param bytes Value marshalled by {@link GridMarshaller}. + * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.GridMarshaller}. */ public GridIndexingEntityAdapter(T val, @Nullable byte[] bytes) { this.val = val; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java index 4369071..4dc2c6d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java @@ -11,9 +11,9 @@ package org.gridgain.grid.spi.swapspace.file; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.swapspace.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java index 58ddf28..1ddadfe 100644 --- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java +++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java @@ -9,8 +9,8 @@ package org.gridgain.jdbc.util; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java index b7c4b7b..bfddb5a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid; -import org.gridgain.grid.marshaller.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java index eaad31e..b84989c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java +++ b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java @@ -10,7 +10,7 @@ package org.gridgain.grid; import org.apache.commons.io.*; -import org.gridgain.grid.marshaller.*; +import org.apache.ignite.marshaller.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java index 45939c9..2383d61 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java @@ -9,8 +9,8 @@ package org.gridgain.grid.ggfs; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java index 023de74..4d14c0e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java @@ -14,12 +14,12 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.managers.communication.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.communication.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java index 6fe2f1c..eb5b96b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index f93cd11..490fbe6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -10,11 +10,11 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java index b54e6f0..823e66a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java index 1dd80eb..65f724a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.dataload; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.portables.*; import org.gridgain.grid.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java index 11979e6..2d87f6f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java index 7c70c2f..844b997 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java @@ -15,6 +15,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java index 9e7af1d..c138707 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.logger.java.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.loadbalancer.*; import org.gridgain.grid.marshaller.jdk.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java index 3e60ab7..9f93fc4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java @@ -9,6 +9,7 @@ package org.gridgain.grid.marshaller.jdk; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.marshaller.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java index 85ddeba..29132c6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java @@ -1,6 +1,7 @@ package org.gridgain.grid.marshaller.optimized; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java index e0af00c..72d9639 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java @@ -2,6 +2,7 @@ package org.gridgain.grid.marshaller.optimized; import org.apache.ignite.*; import org.apache.ignite.compute.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java index 3219121..f37c2bc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java @@ -9,8 +9,8 @@ package org.gridgain.grid.marshaller.optimized; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java index b9a6aaa..8dac019 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java @@ -12,9 +12,9 @@ package org.gridgain.grid.session; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.checkpoint.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index cd1bbcd..0f66823 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -12,12 +12,12 @@ package org.gridgain.grid.spi.communication.tcp; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.spi.communication.*; import org.gridgain.grid.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java index 150dbb8..8f979a3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java @@ -12,6 +12,7 @@ package org.gridgain.grid.spi.communication.tcp; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -19,7 +20,6 @@ import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.query.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java index 6123477..af38e80 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.spi.discovery; import mx4j.tools.adaptor.http.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.kernal.managers.security.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.security.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java index cdcf82c..367f150 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java @@ -10,9 +10,9 @@ package org.gridgain.grid.util.future; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java index 411e3b6..910d3c5 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java @@ -15,13 +15,13 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.log4j.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.license.*; import org.gridgain.grid.kernal.processors.resource.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.jdk.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.checkpoint.sharedfs.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java index 98b0bc8..2aefe07 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java @@ -10,10 +10,10 @@ package org.gridgain.testframework.junits; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.resource.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java index bfe5446..ae3a600 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java @@ -10,10 +10,10 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.hadoop.message.*; import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.ipc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java index 636c05a..3c0080e 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.hadoop.message.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.nio.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java index 1526100..de90bb1 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.kernal.processors.hadoop.message.*; import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java index 0ae3b52..dd2f2bd 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java @@ -10,11 +10,11 @@ package org.gridgain.grid.cache.store.hibernate; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java index acb0004..411431f 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java @@ -10,10 +10,10 @@ package org.gridgain.grid.spi.indexing.h2; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.query.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.indexing.*; import org.gridgain.grid.spi.indexing.h2.opt.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java index 4a4f38b..69e5fed 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java @@ -10,8 +10,8 @@ package org.gridgain.grid.spi.indexing; import org.apache.ignite.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.indexing.h2.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java index cdd68d4..0c42fe9 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java @@ -14,9 +14,9 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lifecycle.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.spi.*; import org.gridgain.grid.spi.collision.*; import org.gridgain.grid.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java index 8e7ae7a..9454b25 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal; import org.apache.ignite.configuration.*; +import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.grid.marshaller.optimized.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java index 48d781e..d1c48c6 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java @@ -12,9 +12,9 @@ package org.gridgain.grid.kernal.processors.resource; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import org.springframework.beans.factory.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java index 3ba8d23..9166f28 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java @@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.resource; import org.apache.ignite.*; import org.apache.ignite.compute.*; +import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.marshaller.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import org.springframework.beans.factory.support.*;
