ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/20] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 14:22:50 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
b/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
deleted file mode 100644
index 7e96007..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.spi.swapspace.inmemory;
-
-import org.apache.ignite.lang.*;
-import org.apache.ignite.spi.*;
-import org.gridgain.grid.spi.swapspace.*;
-import org.gridgain.grid.util.typedef.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.events.IgniteEventType.*;
-
-/**
- * Test swap space SPI that stores values in map.
- */
-@IgniteSpiMultipleInstancesSupport(true)
-public class GridTestSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi {
-    /** Listener. */
-    private SwapSpaceSpiListener lsnr;
-
-    /** Spaces map. */
-    private ConcurrentMap<String, Space> spaces = new ConcurrentHashMap8<>();
-
-    /** {@inheritDoc} */
-    @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void spiStop() throws IgniteSpiException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void clear(@Nullable String spaceName) throws IgniteSpiException {
-        Space space = space(spaceName);
-
-        if (space != null)
-            space.clear();
-    }
-
-    /** {@inheritDoc} */
-    @Override public long size(@Nullable String spaceName) throws IgniteSpiException {
-        Space space = space(spaceName);
-
-        return space != null ? space.size() : 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override public long count(@Nullable String spaceName) throws IgniteSpiException {
-        Space space = space(spaceName);
-
-        return space != null ? space.count() : 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override public byte[] read(@Nullable String spaceName, SwapKey key, SwapContext ctx)
-        throws IgniteSpiException {
-        Space space = space(spaceName);
-
-        return space != null ? space.read(key) : null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<SwapKey, byte[]> readAll(@Nullable String spaceName, Iterable<SwapKey>
keys,
-        SwapContext ctx) throws IgniteSpiException {
-        Space space = space(spaceName);
-
-        return space != null ? space.readAll(keys) : Collections.<SwapKey, byte[]>emptyMap();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void remove(@Nullable String spaceName, SwapKey key, @Nullable IgniteInClosure<byte[]>
c,
-        SwapContext ctx) throws IgniteSpiException {
-        Space space = space(spaceName);
-
-        if (space != null)
-            space.remove(key, c);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void removeAll(@Nullable String spaceName, Collection<SwapKey>
keys,
-        @Nullable IgniteBiInClosure<SwapKey, byte[]> c, SwapContext ctx) throws IgniteSpiException
{
-        Space space = space(spaceName);
-
-        if (space != null)
-            space.removeAll(keys, c);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void store(@Nullable String spaceName, SwapKey key, @Nullable byte[]
val, SwapContext ctx)
-        throws IgniteSpiException {
-        ensureSpace(spaceName).store(key, val);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void storeAll(@Nullable String spaceName, Map<SwapKey, byte[]>
pairs, SwapContext ctx)
-        throws IgniteSpiException {
-        ensureSpace(spaceName).storeAll(pairs);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void setListener(@Nullable SwapSpaceSpiListener evictLsnr) {
-        lsnr = evictLsnr;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Collection<Integer> partitions(@Nullable String spaceName) throws
IgniteSpiException {
-        Space space = space(spaceName);
-
-        return space != null ? space.partitions() : Collections.<Integer>emptyList();
-    }
-
-    /** {@inheritDoc} */
-    @Override public <K> IgniteSpiCloseableIterator<K> keyIterator(@Nullable
String spaceName, SwapContext ctx)
-        throws IgniteSpiException {
-        return ensureSpace(spaceName).keyIterator();
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator(@Nullable
String spaceName)
-        throws IgniteSpiException {
-        return ensureSpace(spaceName).rawIterator();
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator(@Nullable
String spaceName, int part)
-        throws IgniteSpiException {
-        return ensureSpace(spaceName).rawIterator(part);
-    }
-
-    /**
-     * @param spaceName Space name.
-     * @return Space object.
-     */
-    @Nullable private Space space(String spaceName) {
-        return spaces.get(spaceName);
-    }
-
-    /**
-     * Gets space, creates if does not exist.
-     *
-     * @param spaceName Space name.
-     * @return Space.
-     */
-    private Space ensureSpace(String spaceName) {
-        Space space = spaces.get(spaceName);
-
-        if (space == null)
-            space = F.addIfAbsent(spaces, spaceName, new Space(spaceName));
-
-        return space;
-    }
-
-    private void fireEvent(int evtType, String spaceName, @Nullable byte[] key) {
-        SwapSpaceSpiListener lsnr0 = lsnr;
-
-        if (lsnr0 != null)
-            lsnr0.onSwapEvent(evtType, spaceName, key);
-    }
-
-    private class Space {
-        /** Data storage. */
-        private ConcurrentMap<SwapKey, byte[]> data = new ConcurrentHashMap8<>();
-
-        private final String name;
-
-        /**
-         * @param name Space name.
-         */
-        private Space(String name) {
-            this.name = name;
-        }
-
-        /**
-         * Clears space.
-         */
-        public void clear() {
-            data.clear();
-
-            fireEvent(EVT_SWAP_SPACE_CLEARED, name, null);
-        }
-
-        /**
-         * @return Space size.
-         */
-        public long size() {
-            return data.size();
-        }
-
-        /**
-         * @return Space size.
-         */
-        public long count() {
-            return data.size();
-        }
-
-        /**
-         * @param key Key to read.
-         * @return Read bytes.
-         */
-        public byte[] read(SwapKey key) {
-            byte[] bytes = data.get(key);
-
-            fireEvent(EVT_SWAP_SPACE_DATA_READ, name, key.keyBytes());
-
-            return bytes;
-        }
-
-        /**
-         * @param keys Keys to read.
-         * @return Read keys.
-         */
-        public Map<SwapKey, byte[]> readAll(Iterable<SwapKey> keys) {
-            Map<SwapKey, byte[]> res = new HashMap<>();
-
-            for (SwapKey key : keys) {
-                byte[] val = data.get(key);
-
-                if (val != null) {
-                    res.put(key, val);
-
-                    fireEvent(EVT_SWAP_SPACE_DATA_READ, name, key.keyBytes());
-                }
-            }
-
-            return res;
-        }
-
-        /**
-         * @param key Key to remove.
-         * @param c Closure.
-         */
-        public void remove(SwapKey key, IgniteInClosure<byte[]> c) {
-            byte[] val = data.remove(key);
-
-            if (val != null) {
-                c.apply(val);
-
-                fireEvent(EVT_SWAP_SPACE_DATA_REMOVED, name, key.keyBytes());
-            }
-        }
-
-        /**
-         * @param keys Keys to remove.
-         * @param c Closure to apply for removed values.
-         */
-        public void removeAll(Iterable<SwapKey> keys, IgniteBiInClosure<SwapKey,
byte[]> c) {
-            for (SwapKey key : keys) {
-                byte[] val = data.remove(key);
-
-                if (val != null) {
-                    c.apply(key, val);
-
-                    fireEvent(EVT_SWAP_SPACE_DATA_REMOVED, name, key.keyBytes());
-                }
-            }
-        }
-
-        /**
-         * @param key Key to store.
-         * @param val Value to store.
-         */
-        public void store(SwapKey key, byte[] val) {
-            if (val != null) {
-                data.put(key, val);
-
-                fireEvent(EVT_SWAP_SPACE_DATA_STORED, name, key.keyBytes());
-            }
-            else {
-                val = data.remove(key);
-
-                if (val != null)
-                    fireEvent(EVT_SWAP_SPACE_DATA_REMOVED, name, key.keyBytes());
-            }
-        }
-
-        /**
-         * @param pairs Values to store.
-         */
-        public void storeAll(Map<SwapKey, byte[]> pairs) {
-            for (Map.Entry<SwapKey, byte[]> entry : pairs.entrySet()) {
-                SwapKey key = entry.getKey();
-                byte[] val = entry.getValue();
-
-                store(key, val);
-            }
-        }
-
-        /**
-         * @return Partitions in space.
-         */
-        public Collection<Integer> partitions() {
-            Collection<Integer> parts = new HashSet<>();
-
-            for (SwapKey key : data.keySet())
-                parts.add(key.partition());
-
-            return parts;
-        }
-
-        public <K> IgniteSpiCloseableIterator<K> keyIterator() {
-            final Iterator<SwapKey> it = data.keySet().iterator();
-
-            return new IgniteSpiCloseableIterator<K>() {
-                @Override public void close() {
-                    // No-op.
-                }
-
-                @Override public boolean hasNext() {
-                    return it.hasNext();
-                }
-
-                @Override public K next() {
-                    SwapKey next = it.next();
-
-                    return (K)next.key();
-                }
-
-                @Override public void remove() {
-                    it.remove();
-                }
-            };
-        }
-
-        public IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator()
{
-            final Iterator<Map.Entry<SwapKey, byte[]>> it = data.entrySet().iterator();
-
-            return new IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>>()
{
-                @Override public void close() {
-                    // No-op.
-                }
-
-                @Override public boolean hasNext() {
-                    return it.hasNext();
-                }
-
-                @Override public Map.Entry<byte[], byte[]> next() {
-                    final Map.Entry<SwapKey, byte[]> next = it.next();
-
-                    return new Map.Entry<byte[], byte[]>() {
-                        @Override public byte[] getKey() {
-                            return next.getKey().keyBytes();
-                        }
-
-                        @Override public byte[] getValue() {
-                            return next.getValue();
-                        }
-
-                        @Override public byte[] setValue(byte[] val) {
-                            return data.put(next.getKey(), val);
-                        }
-                    };
-                }
-
-                @Override public void remove() {
-                    it.remove();
-                }
-            };
-        }
-
-        public IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator(final
int part) {
-            final Iterator<Map.Entry<SwapKey, byte[]>> it = data.entrySet().iterator();
-
-            return new IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>>()
{
-                /** Next entry in this iterator. */
-                private Map.Entry<SwapKey, byte[]> next;
-
-                private Map.Entry<SwapKey, byte[]> cur;
-
-                {
-                    advance();
-                }
-
-                @Override public void close() {
-                    // No-op.
-                }
-
-                @Override public boolean hasNext() {
-                    return next != null;
-                }
-
-                @Override public Map.Entry<byte[], byte[]> next() {
-                    if (next == null)
-                        throw new NoSuchElementException();
-
-                    final Map.Entry<SwapKey, byte[]> ret = next;
-
-                    cur = ret;
-
-                    advance();
-
-                    return new Map.Entry<byte[], byte[]>() {
-                        @Override public byte[] getKey() {
-                            return ret.getKey().keyBytes();
-                        }
-
-                        @Override public byte[] getValue() {
-                            return ret.getValue();
-                        }
-
-                        @Override public byte[] setValue(byte[] val) {
-                            return data.put(ret.getKey(), val);
-                        }
-                    };
-                }
-
-                @Override public void remove() {
-                    if (cur == null)
-                        throw new IllegalStateException();
-
-                    data.remove(cur.getKey(), cur.getValue());
-                }
-
-                private void advance() {
-                    while (it.hasNext()) {
-                        Map.Entry<SwapKey, byte[]> entry = it.next();
-
-                        if(entry.getKey().partition() == part) {
-                            cur = next;
-
-                            next = entry;
-
-                            return;
-                        }
-                    }
-
-                    next = null;
-                }
-            };
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
deleted file mode 100644
index d7b90de..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.spi.swapspace.noop;
-
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.spi.swapspace.*;
-import org.gridgain.testframework.junits.common.*;
-
-/**
- * Tests for "noop" realization of {@link org.gridgain.grid.spi.swapspace.SwapSpaceSpi}.
- */
-public class GridNoopSwapSpaceSpiSelfTest extends GridCommonAbstractTest {
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
-
-        cfg.setDiscoverySpi(disco);
-
-        return cfg;
-    }
-
-    /**
-     * @throws Exception If test failed.
-     */
-    public void testWithoutCacheUseNoopSwapSapce() throws Exception {
-        try {
-            Ignite ignite = startGrid(1);
-
-            SwapSpaceSpi spi = ignite.configuration().getSwapSpaceSpi();
-
-            assertNotNull(spi);
-
-            assertTrue(spi instanceof NoopSwapSpaceSpi);
-        }
-        finally {
-            stopAllGrids();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/package.html b/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/package.html
deleted file mode 100644
index 5cad80a..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/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 internal tests or test related classes and interfaces.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
index 0f5a559..6d7a0e3 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -19,7 +19,7 @@ import org.gridgain.grid.cache.store.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.spi.swapspace.file.*;
+import org.apache.ignite.spi.swapspace.file.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.loadtests.util.*;
 import org.gridgain.testframework.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/core/src/test/java/org/gridgain/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridSpiTestContext.java
b/modules/core/src/test/java/org/gridgain/testframework/GridSpiTestContext.java
index bc5384d..a0be5f1 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridSpiTestContext.java
@@ -18,7 +18,7 @@ import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.security.*;
 import org.apache.ignite.spi.discovery.*;
-import org.gridgain.grid.spi.swapspace.*;
+import org.apache.ignite.spi.swapspace.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/core/src/test/java/org/gridgain/testsuites/GridSpiSwapSpaceSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridSpiSwapSpaceSelfTestSuite.java
b/modules/core/src/test/java/org/gridgain/testsuites/GridSpiSwapSpaceSelfTestSuite.java
index e5017d5..42afc7f 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridSpiSwapSpaceSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridSpiSwapSpaceSelfTestSuite.java
@@ -10,8 +10,8 @@
 package org.gridgain.testsuites;
 
 import junit.framework.*;
-import org.gridgain.grid.spi.swapspace.file.*;
-import org.gridgain.grid.spi.swapspace.noop.*;
+import org.apache.ignite.spi.swapspace.file.*;
+import org.apache.ignite.spi.swapspace.noop.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 4efc310..3e20845 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.spi.indexing.h2.*;
-import org.gridgain.grid.spi.swapspace.file.*;
+import org.apache.ignite.spi.swapspace.file.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index e5a72f2..88a18fe 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
@@ -20,7 +20,7 @@ import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.spi.indexing.h2.*;
-import org.gridgain.grid.spi.swapspace.file.*;
+import org.apache.ignite.spi.swapspace.file.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 8a7522f..70a4f3e 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.spi.indexing.h2.*;
-import org.gridgain.grid.spi.swapspace.file.*;
+import org.apache.ignite.spi.swapspace.file.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
index dfa298a..1df68e9 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
@@ -19,8 +19,8 @@ import org.gridgain.grid.cache.query.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.spi.swapspace.*;
-import org.gridgain.grid.spi.swapspace.noop.*;
+import org.apache.ignite.spi.swapspace.*;
+import org.apache.ignite.spi.swapspace.noop.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 02355e5..9cdb1c7 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -19,7 +19,7 @@ import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.spi.indexing.h2.*;
-import org.gridgain.grid.spi.swapspace.noop.*;
+import org.apache.ignite.spi.swapspace.noop.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef258ece/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 15de6ec..e00d6f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -671,7 +671,7 @@
                                         </group>
                                         <group>
                                             <title>SPI: Swap Space</title>
-                                            <packages>org.gridgain.grid.spi.swapspace:org.gridgain.grid.spi.swapspace.file:org.gridgain.grid.spi.swapspace.noop</packages>
+                                            <packages>org.gridgain.grid.spi.swapspace:org.apache.ignite.spi.swapspace.file:org.apache.ignite.spi.swapspace.noop</packages>
                                         </group>
                                         <group>
                                             <title>SPI: Discovery</title>
@@ -873,7 +873,7 @@
                                         </group>
                                         <group>
                                             <title>SPI: Swap Space</title>
-                                            <packages>org.gridgain.grid.spi.swapspace:org.gridgain.grid.spi.swapspace.file:org.gridgain.grid.spi.swapspace.noop</packages>
+                                            <packages>org.gridgain.grid.spi.swapspace:org.apache.ignite.spi.swapspace.file:org.apache.ignite.spi.swapspace.noop</packages>
                                         </group>
                                         <group>
                                             <title>SPI: Discovery</title>


Mime
View raw message