ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [21/50] [abbrv] incubator-ignite git commit: GG-9141 - Renaming
Date Tue, 23 Dec 2014 03:14:04 GMT
GG-9141 - Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80178118
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80178118
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80178118

Branch: refs/heads/ignite-32
Commit: 801781186b60c83696738d96466d886174ff19a6
Parents: 3008d2a
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Fri Dec 19 18:04:42 2014 -0800
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Fri Dec 19 18:04:43 2014 -0800

----------------------------------------------------------------------
 .../datagrid/CacheTransactionExample.java       |  4 +-
 .../org/apache/ignite/IgniteTransactions.java   | 12 ++--
 .../TransactionsConfiguration.java              | 18 +++---
 .../transactions/GridCacheTxConcurrency.java    | 37 ------------
 .../transactions/GridCacheTxIsolation.java      | 41 -------------
 .../ignite/transactions/GridCacheTxState.java   | 57 -------------------
 .../GridCacheTxSynchronization.java             |  2 +-
 .../apache/ignite/transactions/IgniteTx.java    | 26 ++++-----
 .../transactions/IgniteTxConcurrency.java       | 37 ++++++++++++
 .../ignite/transactions/IgniteTxIsolation.java  | 41 +++++++++++++
 .../ignite/transactions/IgniteTxState.java      | 57 +++++++++++++++++++
 .../org/gridgain/grid/cache/GridCacheEntry.java |  6 +-
 .../grid/cache/GridCacheProjection.java         | 28 ++++-----
 .../grid/cache/store/GridCacheStore.java        |  2 +-
 .../grid/kernal/IgniteTransactionsEx.java       |  2 +-
 .../processors/cache/GridCacheAdapter.java      | 20 +++----
 .../processors/cache/GridCacheMapEntry.java     |  2 +-
 .../processors/cache/GridCacheProcessor.java    |  2 +-
 .../cache/GridCacheProjectionImpl.java          | 12 ++--
 .../processors/cache/GridCacheProxyImpl.java    | 12 ++--
 .../processors/cache/GridCacheTxAdapter.java    | 60 ++++++++++----------
 .../kernal/processors/cache/GridCacheTxEx.java  |  2 +-
 .../processors/cache/GridCacheTxHandler.java    |  6 +-
 .../cache/GridCacheTxLocalAdapter.java          | 18 +++---
 .../processors/cache/GridCacheTxManager.java    | 20 +++----
 .../kernal/processors/cache/GridCacheUtils.java |  6 +-
 .../processors/cache/IgniteTxProxyImpl.java     |  6 +-
 .../datastructures/GridCacheAtomicLongImpl.java |  4 +-
 .../GridCacheAtomicReferenceImpl.java           |  4 +-
 .../GridCacheAtomicSequenceImpl.java            |  4 +-
 .../GridCacheAtomicStampedImpl.java             |  4 +-
 .../GridCacheCountDownLatchImpl.java            |  4 +-
 .../GridCacheDataStructuresManager.java         |  4 +-
 .../GridTransactionalCacheQueueImpl.java        |  4 +-
 .../GridDistributedCacheAdapter.java            |  4 +-
 .../distributed/GridDistributedLockRequest.java |  8 +--
 .../GridDistributedTxPrepareRequest.java        | 12 ++--
 .../GridDistributedTxRemoteAdapter.java         |  8 +--
 .../distributed/dht/GridDhtLockFuture.java      |  2 +-
 .../distributed/dht/GridDhtLockRequest.java     |  2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  8 +--
 .../distributed/dht/GridDhtTxFinishFuture.java  |  2 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |  8 +--
 .../cache/distributed/dht/GridDhtTxLocal.java   |  6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  | 10 ++--
 .../distributed/dht/GridDhtTxPrepareFuture.java |  2 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |  8 +--
 .../dht/atomic/GridDhtAtomicCache.java          |  2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  2 +-
 .../distributed/near/GridNearAtomicCache.java   |  2 +-
 .../distributed/near/GridNearGetFuture.java     |  2 +-
 .../distributed/near/GridNearLockFuture.java    |  2 +-
 .../distributed/near/GridNearLockRequest.java   |  2 +-
 .../near/GridNearTransactionalCache.java        |  4 +-
 .../near/GridNearTxFinishFuture.java            |  2 +-
 .../cache/distributed/near/GridNearTxLocal.java |  8 +--
 .../near/GridNearTxPrepareFuture.java           |  2 +-
 .../distributed/near/GridNearTxRemote.java      |  8 +--
 .../processors/cache/local/GridLocalCache.java  |  2 +-
 .../processors/cache/local/GridLocalTx.java     |  8 +--
 .../cache/local/GridLocalTxFuture.java          |  2 +-
 .../local/atomic/GridLocalAtomicCache.java      |  2 +-
 .../transactions/IgniteTransactionsImpl.java    | 22 +++----
 .../dataload/GridDataLoadCacheUpdaters.java     |  4 +-
 .../processors/ggfs/GridGgfsDataManager.java    |  4 +-
 .../processors/ggfs/GridGgfsMetaManager.java    |  4 +-
 .../handlers/cache/GridCacheCommandHandler.java |  4 +-
 .../service/GridServiceProcessor.java           |  4 +-
 .../cache/VisorCacheDefaultConfiguration.java   | 12 ++--
 .../grid/kernal/GridStartStopSelfTest.java      |  4 +-
 .../GridCacheAbstractFailoverSelfTest.java      | 16 +++---
 .../cache/GridCacheAbstractFullApiSelfTest.java | 28 ++++-----
 .../cache/GridCacheAbstractTxReadTest.java      | 14 ++---
 .../cache/GridCacheBasicStoreAbstractTest.java  |  4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |  4 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |  4 +-
 .../cache/GridCacheDeploymentSelfTest.java      |  4 +-
 .../GridCacheExAbstractFullApiSelfTest.java     |  4 +-
 .../GridCacheFinishPartitionsSelfTest.java      |  4 +-
 .../GridCacheGroupLockAbstractSelfTest.java     | 34 +++++------
 .../cache/GridCacheGroupLockPutTask.java        |  4 +-
 .../GridCacheInterceptorAbstractSelfTest.java   | 10 ++--
 .../GridCacheMarshallerTxAbstractTest.java      |  4 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |  4 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |  4 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  4 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |  4 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 12 ++--
 .../GridCacheOffHeapTieredAbstractSelfTest.java | 12 ++--
 .../cache/GridCacheOffheapUpdateSelfTest.java   |  4 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |  8 +--
 .../GridCacheWriteBehindStoreAbstractTest.java  |  4 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |  4 +-
 .../processors/cache/IgniteTxAbstractTest.java  | 12 ++--
 .../IgniteTxConcurrentGetAbstractTest.java      |  4 +-
 .../IgniteTxExceptionAbstractSelfTest.java      | 20 +++----
 .../cache/IgniteTxMultiNodeAbstractTest.java    |  4 +-
 .../IgniteTxMultiThreadedAbstractTest.java      | 12 ++--
 .../cache/IgniteTxReentryAbstractSelfTest.java  |  4 +-
 .../IgniteTxSingleThreadedAbstractTest.java     |  4 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java | 20 +++----
 .../GridCacheSequenceApiSelfAbstractTest.java   |  4 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |  4 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  4 +-
 ...tractDistributedByteArrayValuesSelfTest.java |  8 +--
 .../GridCacheAbstractJobExecutionTest.java      |  6 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |  6 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |  4 +-
 .../GridCacheBasicOpAbstractTest.java           |  4 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |  4 +-
 .../distributed/GridCacheEventAbstractTest.java |  4 +-
 .../GridCacheNodeFailureAbstractTest.java       |  6 +-
 .../GridCacheTransformEventSelfTest.java        | 14 ++---
 ...iteTxConsistencyRestartAbstractSelfTest.java |  4 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |  2 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |  2 +-
 .../IgniteTxPreloadAbstractTest.java            |  6 +-
 .../IgniteTxTimeoutAbstractTest.java            |  8 +--
 ...heAbstractTransformWriteThroughSelfTest.java |  6 +-
 .../dht/GridCacheColocatedDebugTest.java        | 18 +++---
 ...eColocatedOptimisticTransactionSelfTest.java |  4 +-
 ...cheGroupLockPartitionedAbstractSelfTest.java |  6 +-
 ...ockPartitionedMultiNodeAbstractSelfTest.java |  8 +--
 ...dCachePartitionedTopologyChangeSelfTest.java |  4 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |  6 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |  6 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |  4 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |  4 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |  4 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |  6 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  4 +-
 .../GridCachePartitionedEvictionSelfTest.java   |  6 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |  4 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |  6 +-
 .../GridCachePartitionedNodeRestartTest.java    |  2 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |  4 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  4 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  | 10 ++--
 .../GridCacheReplicatedInvalidateSelfTest.java  |  8 +--
 ...CacheReplicatedPreloadLifecycleSelfTest.java |  4 +-
 ...heConcurrentEvictionConsistencySelfTest.java |  4 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |  4 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |  4 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |  8 +--
 .../eviction/GridCacheEvictionAbstractTest.java |  4 +-
 .../GridCacheEvictionTouchSelfTest.java         |  4 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |  8 +--
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |  8 +--
 .../processors/ggfs/GridGgfsSizeSelfTest.java   |  4 +-
 .../cache/GridCacheAbstractLoadTest.java        |  8 +--
 ...ridCacheAffinityTransactionsOffHeapTest.java |  4 +-
 .../cache/GridCacheGroupLockComparisonTest.java |  4 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |  4 +-
 .../cache/GridAbstractCacheStoreSelfTest.java   |  6 +-
 .../GridHibernateReadWriteAccessStrategy.java   |  4 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |  4 +-
 .../cache/jta/GridCacheXAResource.java          |  4 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |  2 +-
 .../cache/websession/GridWebSessionFilter.java  |  4 +-
 160 files changed, 669 insertions(+), 669 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
index 3edaced..cb69ec9 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
@@ -16,8 +16,8 @@ import org.gridgain.grid.cache.*;
 import java.io.*;
 
 import static org.gridgain.grid.cache.GridCacheFlag.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
 /**
  * Demonstrates how to use cache transactions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
index e759308..e929d60 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
@@ -37,7 +37,7 @@ public interface IgniteTransactions {
      * @throws IllegalStateException If transaction is already started by this thread.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation);
+    public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation);
 
     /**
      * Starts transaction with specified isolation, concurrency, timeout, invalidation flag,
@@ -51,7 +51,7 @@ public interface IgniteTransactions {
      * @throws IllegalStateException If transaction is already started by this thread.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
+    public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout,
         int txSize);
 
     /**
@@ -87,8 +87,8 @@ public interface IgniteTransactions {
      * @throws IgniteCheckedException If local node is not primary for any of provided keys.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStartAffinity(String cacheName, Object affinityKey, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
+    public IgniteTx txStartAffinity(String cacheName, Object affinityKey, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
 
     /**
      * Starts {@code partition-group-locked} transaction based on partition ID. In this mode the whole partition
@@ -123,8 +123,8 @@ public interface IgniteTransactions {
      * @throws IgniteCheckedException If local node is not primary for any of provided keys.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStartPartition(String cacheName, int partId, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
+    public IgniteTx txStartPartition(String cacheName, int partId, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
 
     /**
      * Gets transaction started by this thread or {@code null} if this thread does

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java
index fea4ffa..5aa700a 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java
@@ -19,10 +19,10 @@ public class TransactionsConfiguration {
     public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false;
 
     /** Default concurrency mode. */
-    public static final GridCacheTxConcurrency DFLT_TX_CONCURRENCY = GridCacheTxConcurrency.PESSIMISTIC;
+    public static final IgniteTxConcurrency DFLT_TX_CONCURRENCY = IgniteTxConcurrency.PESSIMISTIC;
 
     /** Default transaction isolation level. */
-    public static final GridCacheTxIsolation DFLT_TX_ISOLATION = GridCacheTxIsolation.REPEATABLE_READ;
+    public static final IgniteTxIsolation DFLT_TX_ISOLATION = IgniteTxIsolation.REPEATABLE_READ;
 
     /** Default transaction timeout. */
     public static final long DFLT_TRANSACTION_TIMEOUT = 0;
@@ -34,10 +34,10 @@ public class TransactionsConfiguration {
     private boolean txSerEnabled = DFLT_TX_SERIALIZABLE_ENABLED;
 
     /** Transaction isolation. */
-    private GridCacheTxIsolation dfltIsolation = DFLT_TX_ISOLATION;
+    private IgniteTxIsolation dfltIsolation = DFLT_TX_ISOLATION;
 
     /** Cache concurrency. */
-    private GridCacheTxConcurrency dfltConcurrency = DFLT_TX_CONCURRENCY;
+    private IgniteTxConcurrency dfltConcurrency = DFLT_TX_CONCURRENCY;
 
     /** Default transaction timeout. */
     private long dfltTxTimeout = DFLT_TRANSACTION_TIMEOUT;
@@ -68,7 +68,7 @@ public class TransactionsConfiguration {
     }
 
     /**
-     * Gets flag to enable/disable {@link GridCacheTxIsolation#SERIALIZABLE} isolation
+     * Gets flag to enable/disable {@link IgniteTxIsolation#SERIALIZABLE} isolation
      * level for cache transactions. Serializable level does carry certain overhead and
      * if not used, should be disabled. Default value is {@code false}.
      *
@@ -94,7 +94,7 @@ public class TransactionsConfiguration {
      * @return Default cache transaction concurrency.
      * @see IgniteTx
      */
-    public GridCacheTxConcurrency getDefaultTxConcurrency() {
+    public IgniteTxConcurrency getDefaultTxConcurrency() {
         return dfltConcurrency;
     }
 
@@ -103,7 +103,7 @@ public class TransactionsConfiguration {
      *
      * @param dfltConcurrency Default cache transaction concurrency.
      */
-    public void setDefaultTxConcurrency(GridCacheTxConcurrency dfltConcurrency) {
+    public void setDefaultTxConcurrency(IgniteTxConcurrency dfltConcurrency) {
         this.dfltConcurrency = dfltConcurrency;
     }
 
@@ -114,7 +114,7 @@ public class TransactionsConfiguration {
      * @return Default cache transaction isolation.
      * @see IgniteTx
      */
-    public GridCacheTxIsolation getDefaultTxIsolation() {
+    public IgniteTxIsolation getDefaultTxIsolation() {
         return dfltIsolation;
     }
 
@@ -123,7 +123,7 @@ public class TransactionsConfiguration {
      *
      * @param dfltIsolation Default cache transaction isolation.
      */
-    public void setDefaultTxIsolation(GridCacheTxIsolation dfltIsolation) {
+    public void setDefaultTxIsolation(IgniteTxIsolation dfltIsolation) {
         this.dfltIsolation = dfltIsolation;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxConcurrency.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxConcurrency.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxConcurrency.java
deleted file mode 100644
index 7d0ad4c..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxConcurrency.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Transaction concurrency control. See {@link IgniteTx} for more information
- * on transaction concurrency controls.
- */
-public enum GridCacheTxConcurrency {
-    /** Optimistic concurrency control. */
-    OPTIMISTIC,
-
-    /** Pessimistic concurrency control. */
-    PESSIMISTIC;
-
-    /** Enum values. */
-    private static final GridCacheTxConcurrency[] VALS = values();
-
-    /**
-     * Efficiently gets enumerated value from its ordinal.
-     *
-     * @param ord Ordinal value.
-     * @return Enumerated value or {@code null} if ordinal out of range.
-     */
-    @Nullable public static GridCacheTxConcurrency fromOrdinal(int ord) {
-        return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxIsolation.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxIsolation.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxIsolation.java
deleted file mode 100644
index 1644178..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxIsolation.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Defines different cache transaction isolation levels. See {@link IgniteTx}
- * documentation for more information about cache transaction isolation levels.
- */
-public enum GridCacheTxIsolation {
-    /** Read committed isolation level. */
-    READ_COMMITTED,
-
-    /** Repeatable read isolation level. */
-    REPEATABLE_READ,
-
-    /** Serializable isolation level. */
-    SERIALIZABLE;
-
-    /** Enum values. */
-    private static final GridCacheTxIsolation[] VALS = values();
-
-    /**
-     * Efficiently gets enumerated value from its ordinal.
-     *
-     * @param ord Ordinal value.
-     * @return Enumerated value or {@code null} if ordinal out of range.
-     */
-    @Nullable
-    public static GridCacheTxIsolation fromOrdinal(int ord) {
-        return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxState.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxState.java
deleted file mode 100644
index 591acb5..0000000
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxState.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.transactions;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Cache transaction state.
- */
-public enum GridCacheTxState {
-    /** Transaction started. */
-    ACTIVE,
-
-    /** Transaction validating. */
-    PREPARING,
-
-    /** Transaction validation succeeded. */
-    PREPARED,
-
-    /** Transaction is marked for rollback. */
-    MARKED_ROLLBACK,
-
-    /** Transaction commit started (validating finished). */
-    COMMITTING,
-
-    /** Transaction commit succeeded. */
-    COMMITTED,
-
-    /** Transaction rollback started (validation failed). */
-    ROLLING_BACK,
-
-    /** Transaction rollback succeeded. */
-    ROLLED_BACK,
-
-    /** Transaction rollback failed or is otherwise unknown state. */
-    UNKNOWN;
-
-    /** Enumerated values. */
-    private static final GridCacheTxState[] VALS = values();
-
-    /**
-     * Efficiently gets enumerated value from its ordinal.
-     *
-     * @param ord Ordinal value.
-     * @return Enumerated value or {@code null} if ordinal out of range.
-     */
-    @Nullable public static GridCacheTxState fromOrdinal(int ord) {
-        return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
index 5e72f2c..bd177a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/GridCacheTxSynchronization.java
@@ -34,5 +34,5 @@ public interface GridCacheTxSynchronization {
      *      transition this callback is associated with.
      * @param tx Transaction whose state has changed.
      */
-    public void onStateChanged(@Nullable GridCacheTxState prevState, GridCacheTxState newState, IgniteTx tx);
+    public void onStateChanged(@Nullable IgniteTxState prevState, IgniteTxState newState, IgniteTx tx);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
index ec6cbbb..9bd287f 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
@@ -26,25 +26,25 @@ import java.util.*;
  * Cache transactions support the following isolation levels:
  * <ul>
  * <li>
- *  {@link GridCacheTxIsolation#READ_COMMITTED} isolation level means that always a committed value
+ *  {@link IgniteTxIsolation#READ_COMMITTED} isolation level means that always a committed value
  *  will be provided for read operations. With this isolation level values are always read
  *  from cache global memory or persistent store every time a value is accessed. In other words,
  *  if the same key is accessed more than once within the same transaction, it may have different
  *  value every time since global cache memory may be updated concurrently by other threads.
  * </li>
  * <li>
- *  {@link GridCacheTxIsolation#REPEATABLE_READ} isolation level means that if a value was read once
+ *  {@link IgniteTxIsolation#REPEATABLE_READ} isolation level means that if a value was read once
  *  within transaction, then all consecutive reads will provide the same in-transaction value. With
  *  this isolation level accessed values are stored within in-transaction memory, so consecutive access
  *  to the same key within the same transaction will always return the value that was previously read or
- *  updated within this transaction. If concurrency is {@link GridCacheTxConcurrency#PESSIMISTIC}, then a lock
+ *  updated within this transaction. If concurrency is {@link IgniteTxConcurrency#PESSIMISTIC}, then a lock
  *  on the key will be acquired prior to accessing the value.
  * </li>
  * <li>
- *  {@link GridCacheTxIsolation#SERIALIZABLE} isolation level means that all transactions occur in a completely
+ *  {@link IgniteTxIsolation#SERIALIZABLE} isolation level means that all transactions occur in a completely
  *  isolated fashion, as if all transactions in the system had executed serially, one after the other.
- *  Read access with this level happens the same way as with {@link GridCacheTxIsolation#REPEATABLE_READ} level.
- *  However, in {@link GridCacheTxConcurrency#OPTIMISTIC} mode, if some transactions cannot be serially isolated
+ *  Read access with this level happens the same way as with {@link IgniteTxIsolation#REPEATABLE_READ} level.
+ *  However, in {@link IgniteTxConcurrency#OPTIMISTIC} mode, if some transactions cannot be serially isolated
  *  from each other, then one winner will be picked and the other transactions in conflict will result in
  * {@link GridCacheTxOptimisticException} being thrown.
  * </li>
@@ -53,7 +53,7 @@ import java.util.*;
  * Cache transactions support the following concurrency models:
  * <ul>
  * <li>
- *  {@link GridCacheTxConcurrency#OPTIMISTIC} - in this mode all cache operations are not distributed to other
+ *  {@link IgniteTxConcurrency#OPTIMISTIC} - in this mode all cache operations are not distributed to other
  *  nodes until {@link #commit()} or {@link #commitAsync()} are called. In this mode one {@code 'PREPARE'}
  *  message will be sent to participating cache nodes to start acquiring per-transaction locks, and once
  *  all nodes reply {@code 'OK'} (i.e. {@code Phase 1} completes successfully), a one-way' {@code 'COMMIT'}
@@ -63,13 +63,13 @@ import java.util.*;
  *  or by setting proper flags on cache projection, such as {@link GridCacheFlag#SYNC_COMMIT}.
  *  <p>
  *  Note that in this mode, optimistic failures are only possible in conjunction with
- *  {@link GridCacheTxIsolation#SERIALIZABLE} isolation level. In all other cases, optimistic
+ *  {@link IgniteTxIsolation#SERIALIZABLE} isolation level. In all other cases, optimistic
  *  transactions will never fail optimistically and will always be identically ordered on all participating
  *  grid nodes.
  * </li>
  * <li>
- *  {@link GridCacheTxConcurrency#PESSIMISTIC} - in this mode a lock is acquired on all cache operations
- *  with exception of read operations in {@link GridCacheTxIsolation#READ_COMMITTED} mode. All optional filters
+ *  {@link IgniteTxConcurrency#PESSIMISTIC} - in this mode a lock is acquired on all cache operations
+ *  with exception of read operations in {@link IgniteTxIsolation#READ_COMMITTED} mode. All optional filters
  *  passed into cache operations will be evaluated after successful lock acquisition. Whenever
  *  {@link #commit()} or {@link #commitAsync()} is called, a single one-way {@code 'COMMIT'} message
  *  is sent to participating cache nodes without waiting for reply. Note that there is no reason for
@@ -140,14 +140,14 @@ public interface IgniteTx extends GridMetadataAware, AutoCloseable {
      *
      * @return Isolation level.
      */
-    public GridCacheTxIsolation isolation();
+    public IgniteTxIsolation isolation();
 
     /**
      * Cache transaction concurrency mode.
      *
      * @return Concurrency mode.
      */
-    public GridCacheTxConcurrency concurrency();
+    public IgniteTxConcurrency concurrency();
 
     /**
      * Flag indicating whether transaction was started automatically by the
@@ -177,7 +177,7 @@ public interface IgniteTx extends GridMetadataAware, AutoCloseable {
      *
      * @return Current transaction state.
      */
-    public GridCacheTxState state();
+    public IgniteTxState state();
 
     /**
      * Gets timeout value in milliseconds for this transaction. If transaction times

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxConcurrency.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxConcurrency.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxConcurrency.java
new file mode 100644
index 0000000..c054220
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxConcurrency.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Transaction concurrency control. See {@link IgniteTx} for more information
+ * on transaction concurrency controls.
+ */
+public enum IgniteTxConcurrency {
+    /** Optimistic concurrency control. */
+    OPTIMISTIC,
+
+    /** Pessimistic concurrency control. */
+    PESSIMISTIC;
+
+    /** Enum values. */
+    private static final IgniteTxConcurrency[] VALS = values();
+
+    /**
+     * Efficiently gets enumerated value from its ordinal.
+     *
+     * @param ord Ordinal value.
+     * @return Enumerated value or {@code null} if ordinal out of range.
+     */
+    @Nullable public static IgniteTxConcurrency fromOrdinal(int ord) {
+        return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxIsolation.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxIsolation.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxIsolation.java
new file mode 100644
index 0000000..13fb301
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxIsolation.java
@@ -0,0 +1,41 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Defines different cache transaction isolation levels. See {@link IgniteTx}
+ * documentation for more information about cache transaction isolation levels.
+ */
+public enum IgniteTxIsolation {
+    /** Read committed isolation level. */
+    READ_COMMITTED,
+
+    /** Repeatable read isolation level. */
+    REPEATABLE_READ,
+
+    /** Serializable isolation level. */
+    SERIALIZABLE;
+
+    /** Enum values. */
+    private static final IgniteTxIsolation[] VALS = values();
+
+    /**
+     * Efficiently gets enumerated value from its ordinal.
+     *
+     * @param ord Ordinal value.
+     * @return Enumerated value or {@code null} if ordinal out of range.
+     */
+    @Nullable
+    public static IgniteTxIsolation fromOrdinal(int ord) {
+        return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxState.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxState.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxState.java
new file mode 100644
index 0000000..70598d2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxState.java
@@ -0,0 +1,57 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.transactions;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Cache transaction state.
+ */
+public enum IgniteTxState {
+    /** Transaction started. */
+    ACTIVE,
+
+    /** Transaction validating. */
+    PREPARING,
+
+    /** Transaction validation succeeded. */
+    PREPARED,
+
+    /** Transaction is marked for rollback. */
+    MARKED_ROLLBACK,
+
+    /** Transaction commit started (validating finished). */
+    COMMITTING,
+
+    /** Transaction commit succeeded. */
+    COMMITTED,
+
+    /** Transaction rollback started (validation failed). */
+    ROLLING_BACK,
+
+    /** Transaction rollback succeeded. */
+    ROLLED_BACK,
+
+    /** Transaction rollback failed or is otherwise unknown state. */
+    UNKNOWN;
+
+    /** Enumerated values. */
+    private static final IgniteTxState[] VALS = values();
+
+    /**
+     * Efficiently gets enumerated value from its ordinal.
+     *
+     * @param ord Ordinal value.
+     * @return Enumerated value or {@code null} if ordinal out of range.
+     */
+    @Nullable public static IgniteTxState fromOrdinal(int ord) {
+        return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheEntry.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheEntry.java
index 6949dba..6e61dc1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheEntry.java
@@ -482,7 +482,7 @@ public interface GridCacheEntry<K, V> extends Map.Entry<K, V>, GridMetadataAware
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions.
      * If you do need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -506,7 +506,7 @@ public interface GridCacheEntry<K, V> extends Map.Entry<K, V>, GridMetadataAware
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -530,7 +530,7 @@ public interface GridCacheEntry<K, V> extends Map.Entry<K, V>, GridMetadataAware
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
index fb93ad9..965f31e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
@@ -126,13 +126,13 @@ import java.util.concurrent.*;
  * only keys with identical affinity-key (see {@link GridCacheAffinityKeyMapped}) can participate in the
  * transaction, and only one lock on the <i>affinity-key</i> will be acquired for the whole transaction.
  * {@code Affinity-group-locked} transactions are started via
- * {@link #txStartAffinity(Object, GridCacheTxConcurrency, GridCacheTxIsolation, long, int)} method.
+ * {@link #txStartAffinity(Object, IgniteTxConcurrency, IgniteTxIsolation, long, int)} method.
  * <p>
  * With {@code partition-based-group-locking} the keys are grouped by partition ID. This means that
  * only keys belonging to identical partition (see {@link GridCacheAffinity#partition(Object)}) can participate in the
  * transaction, and only one lock on the whole partition will be acquired for the whole transaction.
  * {@code Partition-group-locked} transactions are started via
- * {@link #txStartPartition(int, GridCacheTxConcurrency, GridCacheTxIsolation, long, int)} method.
+ * {@link #txStartPartition(int, IgniteTxConcurrency, IgniteTxIsolation, long, int)} method.
  * <p>
  * <i>Group locking</i> should always be used for transactions whenever possible. If your requirements fit either
  * <i>affinity-based</i> or <i>partition-based</i> scenarios outlined above then <i>group-locking</i>
@@ -1334,7 +1334,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * @throws IllegalStateException If transaction is already started by this thread.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation);
+    public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation);
 
     /**
      * Starts transaction with specified isolation, concurrency, timeout, invalidation flag,
@@ -1348,7 +1348,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * @throws IllegalStateException If transaction is already started by this thread.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
+    public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout,
         int txSize);
 
     /**
@@ -1384,8 +1384,8 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * @throws IgniteCheckedException If local node is not primary for any of provided keys.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
+    public IgniteTx txStartAffinity(Object affinityKey, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
 
     /**
      * Starts {@code partition-group-locked} transaction based on partition ID. In this mode the whole partition
@@ -1420,8 +1420,8 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * @throws IgniteCheckedException If local node is not primary for any of provided keys.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
+    public IgniteTx txStartPartition(int partId, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
 
     /**
      * Gets transaction started by this thread or {@code null} if this thread does
@@ -1843,7 +1843,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -1869,7 +1869,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -1895,7 +1895,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -1921,7 +1921,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -1947,7 +1947,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
@@ -1968,7 +1968,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * <h2 class="header">Transactions</h2>
      * Locks are not transactional and should not be used from within transactions. If you do
      * need explicit locking within transaction, then you should use
-     * {@link GridCacheTxConcurrency#PESSIMISTIC} concurrency control for transaction
+     * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for transaction
      * which will acquire explicit locks for relevant cache operations.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
index b265303..90eb6dc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
@@ -205,7 +205,7 @@ public interface GridCacheStore<K, V> {
      * @param tx Cache transaction being ended.
      * @param commit {@code True} if transaction should commit, {@code false} for rollback.
      * @throws IgniteCheckedException If commit or rollback failed. Note that commit failure in some cases
-     *      may bring cache transaction into {@link GridCacheTxState#UNKNOWN} which will
+     *      may bring cache transaction into {@link IgniteTxState#UNKNOWN} which will
      *      consequently cause all transacted entries to be invalidated.
      */
     public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
index 464cb1c..45cc7c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
@@ -29,6 +29,6 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
      * @throws IllegalStateException If transaction is already started by this thread.
      * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
      */
-    public IgniteTx txStartSystem(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
+    public IgniteTx txStartSystem(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout,
         int txSize);
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
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
index 949482a..5571ffd 100644
--- 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
@@ -51,8 +51,8 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.gridgain.grid.cache.GridCacheFlag.*;
 import static org.gridgain.grid.cache.GridCachePeekMode.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 import static org.gridgain.grid.kernal.GridClosureCallMode.*;
 import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
 import static org.gridgain.grid.kernal.processors.task.GridTaskThreadContextKey.*;
@@ -490,7 +490,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
         GridCacheTxLocalEx<K, V> tx,
         boolean isRead,
         boolean retval,
-        GridCacheTxIsolation isolation,
+        IgniteTxIsolation isolation,
         boolean invalidate,
         IgnitePredicate<GridCacheEntry<K, V>>[] filter);
 
@@ -3120,7 +3120,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+    @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
         A.notNull(concurrency, "concurrency");
         A.notNull(isolation, "isolation");
 
@@ -3135,8 +3135,8 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException {
+    @Override public IgniteTx txStart(IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException {
         IgniteTransactionsEx txs = ctx.kernalContext().cache().transactions();
 
         return ctx.system() ?
@@ -3145,15 +3145,15 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+    @Override public IgniteTx txStartAffinity(Object affinityKey, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
         return ctx.kernalContext().cache().transactions().txStartAffinity(name(), affinityKey, concurrency, isolation,
             timeout, txSize);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+    @Override public IgniteTx txStartPartition(int partId, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
         return ctx.kernalContext().cache().transactions().txStartPartition(name(), partId, concurrency, isolation,
             timeout, txSize);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
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
index aad2447..bdc8882 100644
--- 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
@@ -34,7 +34,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.gridgain.grid.cache.GridCacheFlag.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
 import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
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
index b8a5c92..3e3d7de 100644
--- 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
@@ -53,7 +53,7 @@ import static org.gridgain.grid.cache.GridCacheConfiguration.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.gridgain.grid.cache.GridCachePreloadMode.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
 import static org.gridgain.grid.kernal.GridComponentType.*;
 import static org.gridgain.grid.kernal.GridNodeAttributes.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
index e31f33c..3600637 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
@@ -1205,25 +1205,25 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+    @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
         return cache.txStart(concurrency, isolation);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+    @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation,
         long timeout, int txSize) {
         return cache.txStart(concurrency, isolation, timeout, txSize);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+    @Override public IgniteTx txStartAffinity(Object affinityKey, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
         return cache.txStartAffinity(affinityKey, concurrency, isolation, timeout, txSize);
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+    @Override public IgniteTx txStartPartition(int partId, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
         return cache.txStartPartition(partId, concurrency, isolation, timeout, txSize);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
index b0ba93e..6addcbe 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
@@ -1103,7 +1103,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+    @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
@@ -1116,7 +1116,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+    @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation,
         long timeout, int txSize) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
@@ -1129,8 +1129,8 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+    @Override public IgniteTx txStartAffinity(Object affinityKey, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
@@ -1142,8 +1142,8 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
+    @Override public IgniteTx txStartPartition(int partId, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
index 09a0bc6..f81cdec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
@@ -30,9 +30,9 @@ import java.util.concurrent.locks.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheTxEx.FinalizationStatus.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
 
 /**
@@ -98,11 +98,11 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
 
     /** Isolation. */
     @GridToStringInclude
-    protected GridCacheTxIsolation isolation = READ_COMMITTED;
+    protected IgniteTxIsolation isolation = READ_COMMITTED;
 
     /** Concurrency. */
     @GridToStringInclude
-    protected GridCacheTxConcurrency concurrency = PESSIMISTIC;
+    protected IgniteTxConcurrency concurrency = PESSIMISTIC;
 
     /** Transaction timeout. */
     @GridToStringInclude
@@ -152,11 +152,11 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
 
     /**
      * Transaction state. Note that state is not protected, as we want to
-     * always use {@link #state()} and {@link #state(GridCacheTxState)}
+     * always use {@link #state()} and {@link #state(IgniteTxState)}
      * methods.
      */
     @GridToStringInclude
-    private volatile GridCacheTxState state = ACTIVE;
+    private volatile IgniteTxState state = ACTIVE;
 
     /** Timed out flag. */
     private volatile boolean timedOut;
@@ -219,8 +219,8 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
         boolean implicitSingle,
         boolean loc,
         boolean sys,
-        GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation,
+        IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation,
         long timeout,
         boolean invalidate,
         boolean storeEnabled,
@@ -277,8 +277,8 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
         GridCacheVersion startVer,
         long threadId,
         boolean sys,
-        GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation,
+        IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation,
         long timeout,
         int txSize,
         @Nullable GridCacheTxKey grpLockKey,
@@ -702,12 +702,12 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheTxIsolation isolation() {
+    @Override public IgniteTxIsolation isolation() {
         return isolation;
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheTxConcurrency concurrency() {
+    @Override public IgniteTxConcurrency concurrency() {
         return concurrency;
     }
 
@@ -767,7 +767,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheTxState state() {
+    @Override public IgniteTxState state() {
         return state;
     }
 
@@ -817,7 +817,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
      *
      */
     @Override public void close() throws IgniteCheckedException {
-        GridCacheTxState state = state();
+        IgniteTxState state = state();
 
         if (state != ROLLING_BACK && state != ROLLED_BACK && state != COMMITTING && state != COMMITTED)
             rollback();
@@ -918,7 +918,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
     }
 
     /** {@inheritDoc} */
-    @Override public boolean state(GridCacheTxState state) {
+    @Override public boolean state(IgniteTxState state) {
         return state(state, false);
     }
 
@@ -953,10 +953,10 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
      * @return {@code True} if state changed.
      */
     @SuppressWarnings({"TooBroadScope"})
-    private boolean state(GridCacheTxState state, boolean timedOut) {
+    private boolean state(IgniteTxState state, boolean timedOut) {
         boolean valid = false;
 
-        GridCacheTxState prev;
+        IgniteTxState prev;
 
         boolean notify = false;
 
@@ -1306,10 +1306,10 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
 
         nodeId = U.readUuid(in);
 
-        isolation = GridCacheTxIsolation.fromOrdinal(in.read());
-        concurrency = GridCacheTxConcurrency.fromOrdinal(in.read());
+        isolation = IgniteTxIsolation.fromOrdinal(in.read());
+        concurrency = IgniteTxConcurrency.fromOrdinal(in.read());
 
-        state = GridCacheTxState.fromOrdinal(in.read());
+        state = IgniteTxState.fromOrdinal(in.read());
     }
 
     /**
@@ -1371,10 +1371,10 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
         private final long startTime;
 
         /** Transaction isolation. */
-        private final GridCacheTxIsolation isolation;
+        private final IgniteTxIsolation isolation;
 
         /** Concurrency. */
-        private final GridCacheTxConcurrency concurrency;
+        private final IgniteTxConcurrency concurrency;
 
         /** Invalidate flag. */
         private final boolean invalidate;
@@ -1383,7 +1383,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
         private final long timeout;
 
         /** State. */
-        private final GridCacheTxState state;
+        private final IgniteTxState state;
 
         /** Rollback only flag. */
         private final boolean rollbackOnly;
@@ -1404,9 +1404,9 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
          * @param state Transaction state.
          * @param rollbackOnly Rollback-only flag.
          */
-        TxShadow(IgniteUuid xid, UUID nodeId, long threadId, long startTime, GridCacheTxIsolation isolation,
-            GridCacheTxConcurrency concurrency, boolean invalidate, boolean implicit, long timeout,
-            GridCacheTxState state, boolean rollbackOnly) {
+        TxShadow(IgniteUuid xid, UUID nodeId, long threadId, long startTime, IgniteTxIsolation isolation,
+            IgniteTxConcurrency concurrency, boolean invalidate, boolean implicit, long timeout,
+            IgniteTxState state, boolean rollbackOnly) {
             this.xid = xid;
             this.nodeId = nodeId;
             this.threadId = threadId;
@@ -1441,12 +1441,12 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
         }
 
         /** {@inheritDoc} */
-        @Override public GridCacheTxIsolation isolation() {
+        @Override public IgniteTxIsolation isolation() {
             return isolation;
         }
 
         /** {@inheritDoc} */
-        @Override public GridCacheTxConcurrency concurrency() {
+        @Override public IgniteTxConcurrency concurrency() {
             return concurrency;
         }
 
@@ -1466,7 +1466,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
         }
 
         /** {@inheritDoc} */
-        @Override public GridCacheTxState state() {
+        @Override public IgniteTxState state() {
             return state;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
index a6bfa58..3984e4c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
@@ -397,7 +397,7 @@ public interface GridCacheTxEx<K, V> extends IgniteTx, GridTimeoutObject {
      * @param state Transaction state.
      * @return {@code True} if transition was valid, {@code false} otherwise.
      */
-    public boolean state(GridCacheTxState state);
+    public boolean state(IgniteTxState state);
 
     /**
      * @param invalidate Invalidate flag.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index 86d6cbd..c86ec28 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -24,9 +24,9 @@ import org.jetbrains.annotations.*;
 
 import java.util.*;
 
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
 import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheTxEx.FinalizationStatus.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
index 28c56ee..837b9dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
 import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
 
@@ -109,8 +109,8 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
         boolean implicit,
         boolean implicitSingle,
         boolean sys,
-        GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation,
+        IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation,
         long timeout,
         boolean invalidate,
         boolean storeEnabled,
@@ -336,7 +336,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
             if (timedOut())
                 throw new GridCacheTxTimeoutException("Transaction timed out: " + this);
 
-            GridCacheTxState state = state();
+            IgniteTxState state = state();
 
             setRollbackOnly();
 
@@ -561,7 +561,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
     /** {@inheritDoc} */
     @SuppressWarnings({"CatchGenericClass"})
     @Override public void userCommit() throws IgniteCheckedException {
-        GridCacheTxState state = state();
+        IgniteTxState state = state();
 
         if (state != COMMITTING) {
             if (timedOut())
@@ -933,7 +933,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
 
     /** {@inheritDoc} */
     @Override public void userRollback() throws IgniteCheckedException {
-        GridCacheTxState state = state();
+        IgniteTxState state = state();
 
         if (state != ROLLING_BACK && state != ROLLED_BACK) {
             setRollbackOnly();
@@ -2645,7 +2645,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
             if (timedOut())
                 throw new GridCacheTxTimeoutException("Cache transaction timed out: " + this);
 
-            GridCacheTxState state = state();
+            IgniteTxState state = state();
 
             if (state == ROLLING_BACK || state == ROLLED_BACK)
                 throw new GridCacheTxRollbackException("Cache transaction is marked as rollback-only " +
@@ -2689,9 +2689,9 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
 
         checkInternal(key);
 
-        GridCacheTxState state = state();
+        IgniteTxState state = state();
 
-        assert state == GridCacheTxState.ACTIVE || timedOut() :
+        assert state == IgniteTxState.ACTIVE || timedOut() :
             "Invalid tx state for adding entry [op=" + op + ", val=" + val + ", entry=" + entry + ", filter=" +
                 Arrays.toString(filter) + ", txCtx=" + cctx.tm().txContextVersion() + ", tx=" + this + ']';
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index 42f8364..dc35d47 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -33,8 +33,8 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxState.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxState.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheTxEx.FinalizationStatus.*;
 import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*;
 import static org.gridgain.grid.util.GridConcurrentFactory.*;
@@ -173,7 +173,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
     private boolean salvageTx(GridCacheTxEx<K, V> tx, boolean warn, GridCacheTxEx.FinalizationStatus status) {
         assert tx != null;
 
-        GridCacheTxState state = tx.state();
+        IgniteTxState state = tx.state();
 
         if (state == ACTIVE || state == PREPARING || state == PREPARED) {
             try {
@@ -362,8 +362,8 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
         boolean implicit,
         boolean implicitSingle,
         boolean sys,
-        GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation,
+        IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation,
         long timeout,
         boolean invalidate,
         boolean storeEnabled,
@@ -494,9 +494,9 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
      * Creates a future that will wait for all ongoing transactions that maybe affected by topology update
      * to be finished. This set of transactions include
      * <ul>
-     *     <li/> All {@link GridCacheTxConcurrency#PESSIMISTIC} transactions with topology version
+     *     <li/> All {@link IgniteTxConcurrency#PESSIMISTIC} transactions with topology version
      *     less or equal to {@code topVer}.
-     *     <li/> {@link GridCacheTxConcurrency#OPTIMISTIC} transactions in PREPARING state with topology
+     *     <li/> {@link IgniteTxConcurrency#OPTIMISTIC} transactions in PREPARING state with topology
      *     version less or equal to {@code topVer} and having transaction key with entry that belongs to
      *     one of partitions in {@code parts}.
      * </ul>
@@ -530,7 +530,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
             else if (tx.concurrency() == OPTIMISTIC) {
                 // For OPTIMISTIC mode we wait only for txs in PREPARING state that
                 // have keys for given partitions.
-                GridCacheTxState state = tx.state();
+                IgniteTxState state = tx.state();
                 long txTopVer = tx.topologyVersion();
 
                 if ((state == PREPARING || state == PREPARED || state == COMMITTING)
@@ -1680,7 +1680,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
      * @param newState New state.
      * @param tx Cache transaction.
      */
-    public void onTxStateChange(@Nullable GridCacheTxState prevState, GridCacheTxState newState, IgniteTx tx) {
+    public void onTxStateChange(@Nullable IgniteTxState prevState, IgniteTxState newState, IgniteTx tx) {
         // Notify synchronizations.
         for (GridCacheTxSynchronization s : syncs)
             s.onStateChanged(prevState, newState, tx);
@@ -1755,7 +1755,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
 
         for (GridCacheTxEx<K, V> tx : txs()) {
             if (nearVer.equals(tx.nearXidVersion())) {
-                GridCacheTxState state = tx.state();
+                IgniteTxState state = tx.state();
 
                 if (state == PREPARED || state == COMMITTING || state == COMMITTED) {
                     if (--txNum == 0)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
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
index dbd7c0f..e29da86 100644
--- 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
@@ -1199,7 +1199,7 @@ public class GridCacheUtils {
      * @return New transaction.
      */
     public static IgniteTx txStartInternal(GridCacheContext ctx, GridCacheProjection prj,
-        GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+        IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
         assert ctx != null;
         assert prj != null;
 
@@ -1612,8 +1612,8 @@ public class GridCacheUtils {
      * @param clo Closure.
      * @throws IgniteCheckedException If failed.
      */
-    public static <K, V> void inTx(GridCacheProjection<K, V> cache, GridCacheTxConcurrency concurrency,
-        GridCacheTxIsolation isolation, IgniteInClosureX<GridCacheProjection<K ,V>> clo) throws IgniteCheckedException {
+    public static <K, V> void inTx(GridCacheProjection<K, V> cache, IgniteTxConcurrency concurrency,
+        IgniteTxIsolation isolation, IgniteInClosureX<GridCacheProjection<K ,V>> clo) throws IgniteCheckedException {
 
         try (IgniteTx tx = cache.txStart(concurrency, isolation)) {
             clo.applyx(cache);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
index 844bd44..7d43bc4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/IgniteTxProxyImpl.java
@@ -107,12 +107,12 @@ public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheTxIsolation isolation() {
+    @Override public IgniteTxIsolation isolation() {
         return tx.isolation();
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheTxConcurrency concurrency() {
+    @Override public IgniteTxConcurrency concurrency() {
         return tx.concurrency();
     }
 
@@ -132,7 +132,7 @@ public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public GridCacheTxState state() {
+    @Override public IgniteTxState state() {
         return tx.state();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
index 10a2ad6..1af8cb2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
@@ -22,8 +22,8 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
 /**
  * Cache atomic long implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
index 7d10060..97b7c19 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
@@ -22,8 +22,8 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
 /**
  * Cache atomic reference implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
index ba25633..5ed2d60 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
@@ -26,8 +26,8 @@ import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
 /**
  * Cache sequence implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80178118/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
index 51aaf45..78bfec1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.transactions.GridCacheTxConcurrency.*;
-import static org.apache.ignite.transactions.GridCacheTxIsolation.*;
+import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
+import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
 /**
  * Cache atomic stamped implementation.


Mime
View raw message