# ignite-63

apache · Jan 22, 2015 · ef78d14 · ef78d14
1 parent 21a8762
commit ef78d14
Show file tree

Hide file tree

Showing 29 changed files with 30 additions and 30 deletions.
diff --git a/...ibuted/dht/atomic/GridDhtAtomicCache.java → ...ibuted/dht/atomic/GridDhtAtomicCache.java b/...ibuted/dht/atomic/GridDhtAtomicCache.java → ...ibuted/dht/atomic/GridDhtAtomicCache.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...d/dht/atomic/GridDhtAtomicCacheEntry.java → ...d/dht/atomic/GridDhtAtomicCacheEntry.java b/...d/dht/atomic/GridDhtAtomicCacheEntry.java → ...d/dht/atomic/GridDhtAtomicCacheEntry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/.../GridDhtAtomicDeferredUpdateResponse.java → .../GridDhtAtomicDeferredUpdateResponse.java b/.../GridDhtAtomicDeferredUpdateResponse.java → .../GridDhtAtomicDeferredUpdateResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.internal.*;
 import org.gridgain.grid.kernal.processors.cache.*;

diff --git a/...dht/atomic/GridDhtAtomicUpdateFuture.java → ...dht/atomic/GridDhtAtomicUpdateFuture.java b/...dht/atomic/GridDhtAtomicUpdateFuture.java → ...dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...ht/atomic/GridDhtAtomicUpdateRequest.java → ...ht/atomic/GridDhtAtomicUpdateRequest.java b/...ht/atomic/GridDhtAtomicUpdateRequest.java → ...ht/atomic/GridDhtAtomicUpdateRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...t/atomic/GridDhtAtomicUpdateResponse.java → ...t/atomic/GridDhtAtomicUpdateResponse.java b/...t/atomic/GridDhtAtomicUpdateResponse.java → ...t/atomic/GridDhtAtomicUpdateResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/...ht/atomic/GridNearAtomicUpdateFuture.java → ...ht/atomic/GridNearAtomicUpdateFuture.java b/...ht/atomic/GridNearAtomicUpdateFuture.java → ...ht/atomic/GridNearAtomicUpdateFuture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...t/atomic/GridNearAtomicUpdateRequest.java → ...t/atomic/GridNearAtomicUpdateRequest.java b/...t/atomic/GridNearAtomicUpdateRequest.java → ...t/atomic/GridNearAtomicUpdateRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/.../atomic/GridNearAtomicUpdateResponse.java → .../atomic/GridNearAtomicUpdateResponse.java b/.../atomic/GridNearAtomicUpdateResponse.java → .../atomic/GridNearAtomicUpdateResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/.../dht/colocated/GridDhtColocatedCache.java → .../dht/colocated/GridDhtColocatedCache.java b/.../dht/colocated/GridDhtColocatedCache.java → .../dht/colocated/GridDhtColocatedCache.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
+package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...colocated/GridDhtColocatedCacheEntry.java → ...colocated/GridDhtColocatedCacheEntry.java b/...colocated/GridDhtColocatedCacheEntry.java → ...colocated/GridDhtColocatedCacheEntry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
+package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
 import org.apache.ignite.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;

diff --git a/...colocated/GridDhtColocatedLockFuture.java → ...colocated/GridDhtColocatedLockFuture.java b/...colocated/GridDhtColocatedLockFuture.java → ...colocated/GridDhtColocatedLockFuture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
+package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/.../colocated/GridDhtDetachedCacheEntry.java → .../colocated/GridDhtDetachedCacheEntry.java b/.../colocated/GridDhtDetachedCacheEntry.java → .../colocated/GridDhtDetachedCacheEntry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
+package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
 
 import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.cache.*;

diff --git a/...ava/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/...ava/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -25,7 +25,7 @@
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.future.*;

diff --git a/.../main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageFactory.java b/.../main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageFactory.java
@@ -25,7 +25,7 @@
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.query.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -34,7 +34,7 @@
 import org.apache.ignite.internal.managers.swapspace.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
 import org.apache.ignite.internal.processors.cache.jta.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
@@ -36,8 +36,8 @@
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.processors.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
 import org.apache.ignite.internal.processors.cache.jta.*;

diff --git a/.../org/gridgain/grid/kernal/processors/cache/distributed/GridPartitionedCacheEntryImpl.java b/.../org/gridgain/grid/kernal/processors/cache/distributed/GridPartitionedCacheEntryImpl.java
@@ -23,7 +23,7 @@
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;

diff --git a/...n/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/...n/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -24,7 +24,7 @@
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.util.future.*;

diff --git a/...omicInvalidPartitionHandlingSelfTest.java → ...omicInvalidPartitionHandlingSelfTest.java b/...omicInvalidPartitionHandlingSelfTest.java → ...omicInvalidPartitionHandlingSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...tomic/GridCacheAtomicPreloadSelfTest.java → ...tomic/GridCacheAtomicPreloadSelfTest.java b/...tomic/GridCacheAtomicPreloadSelfTest.java → ...tomic/GridCacheAtomicPreloadSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...ConsistencyAtomicNearEnabledSelfTest.java → ...ConsistencyAtomicNearEnabledSelfTest.java b/...ConsistencyAtomicNearEnabledSelfTest.java → ...ConsistencyAtomicNearEnabledSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.cache.*;
 

diff --git a/...PrimaryWriteOrderNearEnabledSelfTest.java → ...PrimaryWriteOrderNearEnabledSelfTest.java b/...PrimaryWriteOrderNearEnabledSelfTest.java → ...PrimaryWriteOrderNearEnabledSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.cache.*;
 

diff --git a/...dCacheValueConsistencyAtomicSelfTest.java → ...dCacheValueConsistencyAtomicSelfTest.java b/...dCacheValueConsistencyAtomicSelfTest.java → ...dCacheValueConsistencyAtomicSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
+package org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...t/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java b/...t/java/org/gridgain/grid/kernal/processors/cache/GridCacheAtomicMessageCountSelfTest.java
@@ -22,7 +22,7 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.communication.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
 import org.apache.ignite.spi.communication.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;

diff --git a/...org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/...org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
@@ -26,7 +26,7 @@
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.communication.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
 import org.apache.ignite.spi.communication.tcp.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.nio.*;

diff --git a/...s/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/...s/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
@@ -27,7 +27,7 @@
 import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.local.*;
 import org.apache.ignite.internal.util.typedef.*;

diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
@@ -19,7 +19,7 @@
 
 import junit.framework.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 
 /**

diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -28,7 +28,7 @@
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.replicated.preloader.*;