# ignite-63

apache · Jan 22, 2015 · c4116c1 · c4116c1
1 parent e0b7516
commit c4116c1
Show file tree

Hide file tree

Showing 95 changed files with 97 additions and 97 deletions.
diff --git a/...c/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java b/...c/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java
@@ -36,7 +36,7 @@
 import org.apache.ignite.internal.managers.communication.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.gridgain.testframework.*;

diff --git a/...pache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/...pache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -28,7 +28,7 @@
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.query.continuous.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.task.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java b/...core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
@@ -19,7 +19,7 @@
 
 import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.dr.*;
 import org.jetbrains.annotations.*;
 

diff --git a/...src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java b/...src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.dr.*;
 import org.jetbrains.annotations.*;
 

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

diff --git a/...s/cache/transactions/IgniteTxAdapter.java → ...s/cache/transactions/IgniteTxAdapter.java b/...s/cache/transactions/IgniteTxAdapter.java → ...s/cache/transactions/IgniteTxAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.transactions;
+package org.apache.ignite.internal.processors.cache.transactions;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

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

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

diff --git a/...s/cache/transactions/IgniteTxHandler.java → ...s/cache/transactions/IgniteTxHandler.java b/...s/cache/transactions/IgniteTxHandler.java → ...s/cache/transactions/IgniteTxHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.transactions;
+package org.apache.ignite.internal.processors.cache.transactions;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
@@ -38,7 +38,7 @@
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 import static org.apache.ignite.transactions.IgniteTxState.*;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
-import static org.gridgain.grid.kernal.processors.cache.transactions.IgniteTxEx.FinalizationStatus.*;
+import static org.apache.ignite.internal.processors.cache.transactions.IgniteTxEx.FinalizationStatus.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
 
 /**

diff --git a/...ssors/cache/transactions/IgniteTxKey.java → ...ssors/cache/transactions/IgniteTxKey.java b/...ssors/cache/transactions/IgniteTxKey.java → ...ssors/cache/transactions/IgniteTxKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.transactions;
+package org.apache.ignite.internal.processors.cache.transactions;
 
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

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

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

diff --git a/...s/cache/transactions/IgniteTxManager.java → ...s/cache/transactions/IgniteTxManager.java b/...s/cache/transactions/IgniteTxManager.java → ...s/cache/transactions/IgniteTxManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.transactions;
+package org.apache.ignite.internal.processors.cache.transactions;
 
 import org.apache.ignite.*;
 import org.apache.ignite.events.*;
@@ -44,7 +44,7 @@
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxState.*;
-import static org.gridgain.grid.kernal.processors.cache.transactions.IgniteTxEx.FinalizationStatus.*;
+import static org.apache.ignite.internal.processors.cache.transactions.IgniteTxEx.FinalizationStatus.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
 import static org.apache.ignite.internal.util.GridConcurrentFactory.*;
 

diff --git a/...ssors/cache/transactions/IgniteTxMap.java → ...ssors/cache/transactions/IgniteTxMap.java b/...ssors/cache/transactions/IgniteTxMap.java → ...ssors/cache/transactions/IgniteTxMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.transactions;
+package org.apache.ignite.internal.processors.cache.transactions;
 
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;

diff --git a/.../transactions/IgniteTxMetricsAdapter.java → .../transactions/IgniteTxMetricsAdapter.java b/.../transactions/IgniteTxMetricsAdapter.java → .../transactions/IgniteTxMetricsAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.transactions;
+package org.apache.ignite.internal.processors.cache.transactions;
 
 import org.apache.ignite.transactions.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

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

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

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

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -38,7 +38,7 @@
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.dr.*;
 import org.apache.ignite.internal.processors.task.*;
 import org.apache.ignite.internal.util.future.*;

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
@@ -41,7 +41,7 @@
 import org.gridgain.grid.kernal.processors.cache.local.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.query.continuous.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.closure.*;
 import org.apache.ignite.internal.processors.offheap.*;
 import org.apache.ignite.internal.processors.timeout.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.dr.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.jetbrains.annotations.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;

diff --git a/.../core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java b/.../core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.lang.*;

diff --git a/...ore/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java b/...ore/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
@@ -28,7 +28,7 @@
 import org.apache.ignite.thread.*;
 import org.apache.ignite.internal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.timeout.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.lang.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
@@ -25,7 +25,7 @@
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.cache.extras.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.dr.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.offheap.unsafe.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
@@ -23,7 +23,7 @@
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.internal.managers.deployment.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/.../core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java b/.../core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.future.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;

diff --git a/...es/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java b/...es/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
@@ -26,7 +26,7 @@
 import org.apache.ignite.internal.managers.discovery.*;
 import org.apache.ignite.internal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;

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
@@ -45,7 +45,7 @@
 import org.gridgain.grid.kernal.processors.cache.local.atomic.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.query.continuous.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/.../core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/.../core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
@@ -29,7 +29,7 @@
 import org.apache.ignite.internal.managers.deployment.*;
 import org.apache.ignite.internal.managers.discovery.*;
 import org.apache.ignite.internal.managers.eventstorage.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.timeout.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.typedef.*;

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
@@ -27,7 +27,7 @@
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/.../java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheCommittedTxInfo.java b/.../java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheCommittedTxInfo.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;
 

diff --git a/...in/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java b/...in/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
@@ -22,7 +22,7 @@
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

diff --git a/...n/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/...n/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
@@ -19,7 +19,7 @@
 
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 

diff --git a/...g/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java b/...g/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.*;
 import org.apache.ignite.internal.util.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.processors.timeout.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jdk8.backport.*;

diff --git a/.../grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java b/.../grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.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.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

diff --git a/...grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java b/...grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 

diff --git a/...n/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxCommitBuffer.java b/...n/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxCommitBuffer.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

diff --git a/...va/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java b/...va/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.lang.*;
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

diff --git a/...java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheEntry.java b/...java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

diff --git a/...ava/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java b/...ava/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -22,7 +22,7 @@
 import org.apache.ignite.lang.*;
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.transactions.*;
+import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.internal.*;