# ignite-188: Applied renamings to ent project.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/30901e85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/30901e85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/30901e85 Branch: refs/heads/ignite-188 Commit: 30901e85bf8c56548d373715032be99649632a5b Parents: 33834a3 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 6 18:20:30 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 6 18:20:30 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 6 +++--- config/java.util.logging.properties | 14 ++++++------- config/router/default-router.xml | 2 +- .../java/org/apache/ignite/IgniteCache.java | 22 -------------------- .../main/java/org/apache/ignite/IgniteFs.java | 4 ++-- .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../ignite/compute/ComputeLoadBalancer.java | 2 +- .../org/apache/ignite/compute/ComputeTask.java | 2 +- .../ignite/compute/ComputeTaskAdapter.java | 2 +- .../compute/ComputeTaskContinuousMapper.java | 4 ++-- .../ignite/compute/ComputeTaskSession.java | 6 +++--- .../configuration/IgniteConfiguration.java | 6 +++--- .../configuration/IgniteFsConfiguration.java | 4 ++-- .../IgniteFsGroupDataBlocksKeyMapper.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../processors/cache/GridCacheAdapter.java | 8 +++---- .../processors/cache/GridCacheProcessor.java | 10 ++++----- .../cache/GridCacheSharedContext.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 8 +++---- .../cache/version/GridCacheVersionManager.java | 2 +- .../ignite/resources/CacheNameResource.java | 4 ++-- .../ignite/resources/LoadBalancerResource.java | 4 ++-- .../apache/ignite/resources/LoggerResource.java | 4 ++-- .../apache/ignite/resources/SpringResource.java | 2 +- .../resources/TaskContinuousMapperResource.java | 4 ++-- .../ignite/resources/TaskSessionResource.java | 4 ++-- .../PriorityQueueCollisionSpi.java | 4 ++-- .../spi/loadbalancing/LoadBalancingSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../GridTaskExecutionContextSelfTest.java | 2 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java | 2 +- .../cache/GridCacheAbstractTxReadTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 ++-- .../GridCacheInterceptorAbstractSelfTest.java | 2 +- .../IgniteTxExceptionAbstractSelfTest.java | 2 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCollectionAbstractTest.java | 2 +- ...tractPartitionedByteArrayValuesSelfTest.java | 2 +- .../GridCacheTransformEventSelfTest.java | 2 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...eColocatedOptimisticTransactionSelfTest.java | 2 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 2 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 2 +- .../near/GridCacheNearJobExecutionSelfTest.java | 2 +- .../near/GridCacheNearMultiGetSelfTest.java | 2 +- .../GridCachePartitionedEvictionSelfTest.java | 2 +- ...titionedExplicitLockNodeFailureSelfTest.java | 2 +- .../GridCachePartitionedFullApiSelfTest.java | 2 +- .../GridCachePartitionedMetricsSelfTest.java | 2 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +- ...GridCachePartitionedNodeFailureSelfTest.java | 2 +- .../GridCachePartitionedNodeRestartTest.java | 2 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 ++-- ...CachePartitionedTxMultiThreadedSelfTest.java | 2 +- ...achePartitionedTxSingleThreadedSelfTest.java | 2 +- .../GridCachePartitionedTxTimeoutSelfTest.java | 2 +- ...stractReplicatedByteArrayValuesSelfTest.java | 2 +- .../GridCacheReplicatedFullApiSelfTest.java | 2 +- .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- .../GridCacheReplicatedJobExecutionTest.java | 2 +- .../GridCacheReplicatedMetricsSelfTest.java | 2 +- .../GridCacheReplicatedNodeFailureSelfTest.java | 2 +- ...dCacheReplicatedTxMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedTxSingleThreadedSelfTest.java | 2 +- .../GridCacheReplicatedTxTimeoutSelfTest.java | 4 ++-- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 ++-- ...heConcurrentEvictionConsistencySelfTest.java | 4 ++-- .../GridCacheConcurrentEvictionsSelfTest.java | 4 ++-- .../GridCacheDistributedEvictionsSelfTest.java | 2 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 2 +- .../GridCacheEvictionTouchSelfTest.java | 2 +- ...iteCacheNoLoadPreviousValueAbstractTest.java | 2 +- .../IgniteCacheNoReadThroughAbstractTest.java | 2 +- .../IgniteCacheNoWriteThroughAbstractTest.java | 2 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 2 +- .../local/GridCacheLocalFullApiSelfTest.java | 2 +- .../local/GridCacheLocalMetricsSelfTest.java | 2 +- .../GridCacheLocalTxMultiThreadedSelfTest.java | 2 +- .../GridCacheLocalTxSingleThreadedSelfTest.java | 2 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 4 ++-- .../cache/GridCacheAbstractLoadTest.java | 4 ++-- .../GridCachePartitionedAtomicLongLoadTest.java | 4 ++-- .../hadoop/v1/GridGgfsHadoopFileSystem.java | 2 +- .../hadoop/v2/GridGgfsHadoopFileSystem.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../processors/cache/jta/CacheJtaManager.java | 2 +- ...gniteProjectionStartStopRestartSelfTest.java | 2 +- .../org/apache/ignite/yardstick/IgniteNode.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 2 +- 92 files changed, 131 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index 9a2ab3c..cb86623 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -151,9 +151,9 @@ --> <property name="includeEventTypes"> <list> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FAILED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_TASK_FINISHED"/> - <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVT_JOB_MAPPED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FINISHED"/> + <util:constant static-field="org.apache.ignite.events.EventType.EVT_JOB_MAPPED"/> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/config/java.util.logging.properties ---------------------------------------------------------------------- diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties index dfabf10..bcd3fa5 100644 --- a/config/java.util.logging.properties +++ b/config/java.util.logging.properties @@ -28,7 +28,7 @@ # # By default all messages will be passed to console and file. # -handlers=java.util.logging.ConsoleHandler, org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler +handlers=java.util.logging.ConsoleHandler, org.apache.ignite.logger.java.JavaLoggerFileHandler # # Default global logging level. @@ -60,15 +60,15 @@ handlers=java.util.logging.ConsoleHandler, org.apache.ignite.logger.java.IgniteJ # Console handler logs all messages with importance level `INFO` and above # into standard error stream (`System.err`). # -java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter +java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.JavaLoggerFormatter java.util.logging.ConsoleHandler.level=INFO # # File handler logs all messages into files with pattern `ignite-%{id8}.%g.log` # under `$IGNITE_HOME/work/log/` directory. The placeholder `%{id8}` is a truncated node ID. # -org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter -org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.pattern=ignite-%{id8}.%g.log -org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.level=INFO -org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.limit=10485760 -org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.count=10 +org.apache.ignite.logger.java.JavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.JavaLoggerFormatter +org.apache.ignite.logger.java.JavaLoggerFileHandler.pattern=ignite-%{id8}.%g.log +org.apache.ignite.logger.java.JavaLoggerFileHandler.level=INFO +org.apache.ignite.logger.java.JavaLoggerFileHandler.limit=10485760 +org.apache.ignite.logger.java.JavaLoggerFileHandler.count=10 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/config/router/default-router.xml ---------------------------------------------------------------------- diff --git a/config/router/default-router.xml b/config/router/default-router.xml index e40a31f..651794b 100644 --- a/config/router/default-router.xml +++ b/config/router/default-router.xml @@ -47,5 +47,5 @@ <!-- Logger with the same configuration as in default grid instances. --> - <bean id="router.log" class="org.apache.ignite.logger.java.IgniteJavaLogger"/> + <bean id="router.log" class="org.apache.ignite.logger.java.JavaLogger"/> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index d3d32c4..f2a917e 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -258,28 +258,6 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS public void localPromote(Set<? extends K> keys) throws CacheException; /** - * Clears an entry from this cache and swap storage only if the entry - * is not currently locked, and is not participating in a transaction. - * <p> - * If {@link org.apache.ignite.configuration.CacheConfiguration#isSwapEnabled()} is set to {@code true} and - * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP} is not enabled, the evicted entries will - * also be cleared from swap. - * <p> - * Note that this operation is local as it merely clears - * an entry from local cache. It does not remove entries from - * remote caches or from underlying persistent storage. - * <h2 class="header">Cache Flags</h2> - * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. - * - * @param keys Keys to clear. - * @return {@code True} if entry was successfully cleared from cache, {@code false} - * if entry was in use at the time of this method invocation and could not be - * cleared. - */ - public boolean clear(Collection<? extends K> keys); - - /** * Gets the number of all entries cached across all nodes. * <p> * NOTE: this operation is distributed and will query all participating nodes for their cache sizes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/IgniteFs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java index 94d33ff..c7c23a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java @@ -51,8 +51,8 @@ import java.util.*; * <h1 class="header">Integration With Hadoop</h1> * In addition to direct file system API, {@code GGFS} can be integrated with {@code Hadoop} by * plugging in as {@code Hadoop FileSystem}. Refer to - * {@code org.apache.ignite.fs.hadoop.v1.GridGgfsHadoopFileSystem} or - * {@code org.apache.ignite.fs.hadoop.v2.GridGgfsHadoopFileSystem} for more information. + * {@code org.apache.ignite.ignitefs.hadoop.v1.GridGgfsHadoopFileSystem} or + * {@code org.apache.ignite.ignitefs.hadoop.v2.GridGgfsHadoopFileSystem} for more information. * <p> * <b>NOTE:</b> integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java index ccd8ac6..671609a 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java @@ -117,7 +117,7 @@ import java.util.*; * of certain event or state change that occurred during job execution. * <p> * Distributed task session can be injected into {@link ComputeJob} implementation - * using {@link org.apache.ignite.resources.TaskSessionResource @IgniteTaskSessionResource} annotation. + * using {@link org.apache.ignite.resources.TaskSessionResource @TaskSessionResource} annotation. * Both, field and method based injections are supported. Refer to * {@link ComputeTaskSession} documentation for more information on session functionality. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java index 12107d6..d9f2e21 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java @@ -63,7 +63,7 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @IgniteLoadBalancerResource + * @LoadBalancerResource * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java index 09f4314..0b0c3fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java @@ -152,7 +152,7 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @IgniteLoadBalancerResource + * @LoadBalancerResource * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java index a45a1b2..c2ad198 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java @@ -28,7 +28,7 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @IgniteLoadBalancerResource + * @LoadBalancerResource * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java index ef924c4..3a4cb91 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java @@ -47,7 +47,7 @@ import java.util.*; * <pre name="code" class="java"> * ... * // This field will be injected with task continuous mapper. - * @IgniteTaskContinuousMapperResource + * @TaskContinuousMapperResource * private ComputeTaskContinuousMapper mapper; * ... * </pre> @@ -55,7 +55,7 @@ import java.util.*; * <pre name="code" class="java"> * // This setter method will be automatically called by the system * // to set grid task continuous mapper. - * @IgniteTaskContinuousMapperResource + * @TaskContinuousMapperResource * void setSession(ComputeTaskContinuousMapper mapper) { * this.mapper = mapper; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java index 53da59e..672e12b 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java @@ -76,13 +76,13 @@ import java.util.*; * <p> * <h1 class="header">Session Injection</h1> * Session can be injected into a task or a job using IoC (dependency - * injection) by attaching {@link org.apache.ignite.resources.TaskSessionResource @IgniteTaskSessionResource} + * injection) by attaching {@link org.apache.ignite.resources.TaskSessionResource @TaskSessionResource} * annotation to a field or a setter method inside of {@link ComputeTask} or * {@link ComputeJob} implementations as follows: * <pre name="code" class="java"> * ... * // This field will be injected with distributed task session. - * @IgniteTaskSessionResource + * @TaskSessionResource * private GridComputeTaskSession ses; * ... * </pre> @@ -90,7 +90,7 @@ import java.util.*; * <pre name="code" class="java"> * // This setter method will be automatically called by the system * // to set grid task session. - * @IgniteTaskSessionResource + * @TaskSessionResource * void setSession(GridComputeTaskSession ses) { * this.ses = ses; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index cf16316..7725e7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -645,7 +645,7 @@ public class IgniteConfiguration { sysSvcShutdown = cfg.getSystemExecutorServiceShutdown(); timeSrvPortBase = cfg.getTimeServerPortBase(); timeSrvPortRange = cfg.getTimeServerPortRange(); - txCfg = cfg.getTransactionsConfiguration(); + txCfg = cfg.getTransactionConfiguration(); userAttrs = cfg.getUserAttributes(); waitForSegOnStart = cfg.isWaitForSegmentOnStart(); warmupClos = cfg.getWarmupClosure(); @@ -3117,7 +3117,7 @@ public class IgniteConfiguration { * * @return Transactions configuration. */ - public TransactionConfiguration getTransactionsConfiguration() { + public TransactionConfiguration getTransactionConfiguration() { return txCfg; } @@ -3126,7 +3126,7 @@ public class IgniteConfiguration { * * @param txCfg Transactions configuration. */ - public void setTransactionsConfiguration(TransactionConfiguration txCfg) { + public void setTransactionConfiguration(TransactionConfiguration txCfg) { this.txCfg = txCfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java index 497037b..4b3b455 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteFsConfiguration.java @@ -313,7 +313,7 @@ public class IgniteFsConfiguration { * Default is {@code 0} which means that pre-fetching will start right away. * <h1 class="header">Integration With Hadoop</h1> * This parameter can be also overridden for individual Hadoop MapReduce tasks by passing - * {@code org.apache.ignite.fs.hadoop.GridGgfsHadoopParameters.PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH} + * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH} * configuration property directly to Hadoop MapReduce task. * <p> * <b>NOTE:</b> Integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. @@ -333,7 +333,7 @@ public class IgniteFsConfiguration { * Default is {@code 0} which means that pre-fetching will start right away. * <h1 class="header">Integration With Hadoop</h1> * This parameter can be also overridden for individual Hadoop MapReduce tasks by passing - * {@code org.apache.ignite.fs.hadoop.GridGgfsHadoopParameters.PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH} + * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH} * configuration property directly to Hadoop MapReduce task. * <p> * <b>NOTE:</b> Integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsGroupDataBlocksKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsGroupDataBlocksKeyMapper.java index f40b10e..945b6a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsGroupDataBlocksKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/ignitefs/IgniteFsGroupDataBlocksKeyMapper.java @@ -44,7 +44,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; * <bean id="cacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration" abstract="true"> * ... * <property name="affinityMapper"> - * <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"> + * <bean class="org.apache.ignite.ignitefs.IgniteFsGroupDataBlocksKeyMapper"> * <!-- How many sequential blocks will be stored on the same node. --> * <constructor-arg value="512"/> * </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 7a24270..205b131 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1423,7 +1423,7 @@ public class IgnitionEx { myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); myCfg.setWarmupClosure(cfg.getWarmupClosure()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); - myCfg.setTransactionsConfiguration(new TransactionConfiguration(cfg.getTransactionsConfiguration())); + myCfg.setTransactionConfiguration(new TransactionConfiguration(cfg.getTransactionConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 2c1dc48..342220a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3730,7 +3730,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteTx txStart() throws IllegalStateException { - TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = ctx.gridConfig().getTransactionConfiguration(); return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation()); } @@ -3740,7 +3740,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = ctx.gridConfig().getTransactionConfiguration(); return txStart( concurrency, @@ -4352,7 +4352,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); if (tx == null || tx.implicit()) { - TransactionConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration tCfg = ctx.gridConfig().getTransactionConfiguration(); tx = ctx.tm().newTx( true, @@ -4435,7 +4435,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, ctx.system(), PESSIMISTIC, READ_COMMITTED, - ctx.kernalContext().config().getTransactionsConfiguration().getDefaultTxTimeout(), + ctx.kernalContext().config().getTransactionConfiguration().getDefaultTxTimeout(), ctx.hasFlag(INVALIDATE), !ctx.hasFlag(SKIP_STORE), 0, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index e49f6bb..3a41989 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -351,8 +351,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { throw new IgniteCheckedException("Cannot start cache in PRIVATE or ISOLATED deployment mode: " + ctx.config().getDeploymentMode()); - if (!c.getTransactionsConfiguration().isTxSerializableEnabled() && - c.getTransactionsConfiguration().getDefaultTxIsolation() == SERIALIZABLE) + if (!c.getTransactionConfiguration().isTxSerializableEnabled() && + c.getTransactionConfiguration().getDefaultTxIsolation() == SERIALIZABLE) U.warn(log, "Serializable transactions are disabled while default transaction isolation is SERIALIZABLE " + "(most likely misconfiguration - either update 'isTxSerializableEnabled' or " + @@ -585,7 +585,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { sharedCtx = createSharedContext(ctx); ctx.performance().add("Disable serializable transactions (set 'txSerializableEnabled' to false)", - !ctx.config().getTransactionsConfiguration().isTxSerializableEnabled()); + !ctx.config().getTransactionConfiguration().isTxSerializableEnabled()); Collection<GridCacheAdapter<?, ?>> startSeq = new ArrayList<>(cfgs.length); @@ -948,7 +948,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { attrs.put(ATTR_CACHE, attrVals); - attrs.put(ATTR_TX_CONFIG, ctx.config().getTransactionsConfiguration()); + attrs.put(ATTR_TX_CONFIG, ctx.config().getTransactionConfiguration()); if (!interceptors.isEmpty()) attrs.put(ATTR_CACHE_INTERCEPTORS, interceptors); @@ -1229,7 +1229,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { TransactionConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); if (txCfg != null) { - TransactionConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); + TransactionConfiguration locTxCfg = ctx.config().getTransactionConfiguration(); if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled()) throw new IgniteCheckedException("Serializable transactions enabled mismatch " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index a3e0b24..332abac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -158,7 +158,7 @@ public class GridCacheSharedContext<K, V> { * @return Transactions configuration. */ public TransactionConfiguration txConfig() { - return kernalCtx.config().getTransactionsConfiguration(); + return kernalCtx.config().getTransactionConfiguration(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index f46a59d..7d84194 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -47,7 +47,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { /** {@inheritDoc} */ @Override public IgniteTx txStart() throws IllegalStateException { - TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration(); return txStart0( cfg.getDefaultTxConcurrency(), @@ -63,7 +63,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration(); return txStart0( concurrency, @@ -120,7 +120,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration(); return txStart0(concurrency, isolation, @@ -196,7 +196,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { */ private IgniteInternalTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize, boolean sys) { - TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration(); if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE) throw new IllegalArgumentException("SERIALIZABLE isolation level is disabled (to enable change " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java index b30775d..74b38f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionManager.java @@ -86,7 +86,7 @@ public class GridCacheVersionManager<K, V> extends GridCacheSharedManagerAdapter /** {@inheritDoc} */ @Override public void start0() throws IgniteCheckedException { - txSerEnabled = cctx.gridConfig().getTransactionsConfiguration().isTxSerializableEnabled(); + txSerEnabled = cctx.gridConfig().getTransactionConfiguration().isTxSerializableEnabled(); dataCenterId = cctx.dataCenterId(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java index 114ce18..50ab5cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/CacheNameResource.java @@ -30,7 +30,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyCacheStore implements GridCacheStore { * ... - * @IgniteCacheNameResource + * @CacheNameResource * private String cacheName; * ... * } @@ -41,7 +41,7 @@ import java.lang.annotation.*; * ... * private String cacheName; * ... - * @IgniteCacheNameResource + * @CacheNameResource * public void setCacheName(String cacheName) { * this.cacheName = cacheName; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java index 84f294c..dfac834 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/LoadBalancerResource.java @@ -33,7 +33,7 @@ import java.lang.annotation.*; * Here is how injection would typically happen: * <pre name="code" class="java"> * public class MyGridTask extends ComputeTask<String, Integer> { - * @IgniteLoadBalancerResource + * @LoadBalancerResource * private ComputeLoadBalancer balancer; * } * </pre> @@ -43,7 +43,7 @@ import java.lang.annotation.*; * ... * private ComputeLoadBalancer balancer; * ... - * @IgniteLoadBalancerResource + * @LoadBalancerResource * public void setBalancer(ComputeLoadBalancer balancer) { * this.balancer = balancer; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java index 0bc938f..6e21168 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java @@ -35,7 +35,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @IgniteLoggerResource + * @LoggerResource * private GridLogger log; * ... * } @@ -46,7 +46,7 @@ import java.lang.annotation.*; * ... * private Ignite log; * ... - * @IgniteLoggerResource + * @LoggerResource * public void setGridLogger(IgniteLogger log) { * this.log = log; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java index cfaa1e0..e74be9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java @@ -76,7 +76,7 @@ import java.lang.annotation.*; * private MyUserBean rsrc; * ... * // Inject logger (or any other resource). - * @IgniteLoggerResource + * @LoggerResource * private GridLogger log; * * // Inject ignite instance (or any other resource). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java b/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java index b26e0ee..30cb8fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/TaskContinuousMapperResource.java @@ -30,7 +30,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @IgniteTaskContinuousMapperResource + * @TaskContinuousMapperResource * private ComputeTaskContinuousMapper mapper; * ... * } @@ -41,7 +41,7 @@ import java.lang.annotation.*; * ... * private ComputeTaskContinuousMapper mapper; * ... - * @IgniteTaskContinuousMapperResource + * @TaskContinuousMapperResource * public void setMapper(ComputeTaskContinuousMapper mapper) { * this.mapper = mapper; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java b/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java index 11d85ea..060288f 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/TaskSessionResource.java @@ -33,7 +33,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @IgniteTaskSessionResource + * @TaskSessionResource * private ComputeTaskSession taskSes; * ... * } @@ -44,7 +44,7 @@ import java.lang.annotation.*; * ... * private ComputeTaskSession taskSes; * ... - * @IgniteTaskSessionResource + * @TaskSessionResource * public void setTaskSession(ComputeTaskSession taskSes) { * this.taskSes = taskSes; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java index f297b7c..bcc1fc3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java @@ -105,7 +105,7 @@ import java.util.*; * public class MyGridUsualTask extends ComputeTaskSplitAdapter<Object, Object> { * public static final int SPLIT_COUNT = 20; * - * @IgniteTaskSessionResource + * @TaskSessionResource * private ComputeTaskSession taskSes; * * @Override @@ -131,7 +131,7 @@ import java.util.*; * public class MyGridUrgentTask extends ComputeTaskSplitAdapter<Object, Object> { * public static final int SPLIT_COUNT = 5; * - * @IgniteTaskSessionResource + * @TaskSessionResource * private ComputeTaskSession taskSes; * * @Override http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java index 9897ca3..afac681 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java @@ -58,7 +58,7 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String,String> { * // Inject load balancer. - * @IgniteLoadBalancerResource + * @LoadBalancerResource * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java index c43c251..3f7732f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java @@ -142,7 +142,7 @@ import static org.apache.ignite.events.EventType.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @IgniteLoadBalancerResource + * @LoadBalancerResource * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java index e00fcfd..82db502 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java @@ -68,7 +68,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest { */ public void testWithName() throws Exception { IgniteCallable<String> f = new IgniteCallable<String>() { - @IgniteTaskSessionResource + @TaskSessionResource private ComputeTaskSession ses; @Override public String call() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java index a0f5334..8a9494f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java @@ -70,7 +70,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java index ffa967d..8a1e61f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -828,7 +828,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr tx.commit(); - TransactionConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration(); + TransactionConfiguration tCfg = grid(0).configuration().getTransactionConfiguration(); tx = cache().txStart( tCfg.getDefaultTxConcurrency(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java index 40089b9..7d249dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java @@ -32,7 +32,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index e387d3a..bf02493 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -96,8 +96,8 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC); - c.getTransactionsConfiguration().setDefaultTxIsolation(REPEATABLE_READ); + c.getTransactionConfiguration().setDefaultTxConcurrency(PESSIMISTIC); + c.getTransactionConfiguration().setDefaultTxIsolation(REPEATABLE_READ); AtomicConfiguration atomicCfg = new AtomicConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index 9f815bf..76f119e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -73,7 +73,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 1e87898..a071aa1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -66,7 +66,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac cfg.setIndexingSpi(idxSpi); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index c6ee449..02e00eb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -67,7 +67,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java index d8d6bf3..da3ac7b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java @@ -129,7 +129,7 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes } /** - * TODO IGNITE-180: move properties to IgniteCollectionConfiguration. + * TODO IGNITE-180: move properties to CollectionConfiguration. */ public static class TestCollectionConfiguration { /** Default backups number. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java index 180c808..c5fadaf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java @@ -37,7 +37,7 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend tCfg.setTxSerializableEnabled(true); - cfg.setTransactionsConfiguration(tCfg); + cfg.setTransactionConfiguration(tCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index 55adcc4..4c56428 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -104,7 +104,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { discoSpi.setIpFinder(IP_FINDER); - TransactionConfiguration tCfg = cfg.getTransactionsConfiguration(); + TransactionConfiguration tCfg = cfg.getTransactionConfiguration(); tCfg.setDefaultTxConcurrency(txConcurrency); tCfg.setDefaultTxIsolation(txIsolation); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 40e959c..7c860e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -246,7 +246,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri } }); - cfg.getTransactionsConfiguration().setDefaultTxConcurrency(OPTIMISTIC); + cfg.getTransactionConfiguration().setDefaultTxConcurrency(OPTIMISTIC); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 128c1e7..e4bda25 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -433,7 +433,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest } }); - cfg.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC); + cfg.getTransactionConfiguration().setDefaultTxConcurrency(PESSIMISTIC); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index 551e01e..168a486 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -64,7 +64,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java index 99a1b63..8b30392 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java @@ -44,7 +44,7 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java index b38de47..cbc677b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java @@ -37,7 +37,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java index 47a8f29..86547f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearJobExecutionSelfTest.java @@ -32,7 +32,7 @@ public class GridCacheNearJobExecutionSelfTest extends GridCacheAbstractJobExecu @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index a22458c..6da1db7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -59,7 +59,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java index 2cbfb23..7cef4d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java @@ -66,7 +66,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); TcpDiscoverySpi spi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java index c0fab22..3779d78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java @@ -50,7 +50,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java index f3ce6fa..4e1c78f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFullApiSelfTest.java @@ -42,7 +42,7 @@ public class GridCachePartitionedFullApiSelfTest extends GridCacheAbstractFullAp @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java index b3ceca8..015b8a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMetricsSelfTest.java @@ -35,7 +35,7 @@ public class GridCachePartitionedMetricsSelfTest extends GridCacheTransactionalA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index dffb359..0f53576 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -60,7 +60,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java index 8255fb7..3cdcd1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeFailureSelfTest.java @@ -33,7 +33,7 @@ public class GridCachePartitionedNodeFailureSelfTest extends GridCacheNodeFailur @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java index 35f86c5..834085f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java @@ -34,7 +34,7 @@ public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRe @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC); + c.getTransactionConfiguration().setDefaultTxConcurrency(PESSIMISTIC); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index 8bc91b2..324c118 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -34,7 +34,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setDefaultTxConcurrency(OPTIMISTIC); + c.getTransactionConfiguration().setDefaultTxConcurrency(OPTIMISTIC); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 1ea53b6..a2ee133 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -46,8 +46,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setDefaultTxConcurrency(IgniteTxConcurrency.OPTIMISTIC); - c.getTransactionsConfiguration().setDefaultTxIsolation(IgniteTxIsolation.READ_COMMITTED); + c.getTransactionConfiguration().setDefaultTxConcurrency(IgniteTxConcurrency.OPTIMISTIC); + c.getTransactionConfiguration().setDefaultTxIsolation(IgniteTxIsolation.READ_COMMITTED); CacheConfiguration cc1 = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java index 1279b10..e6042e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java @@ -42,7 +42,7 @@ public class GridCachePartitionedTxMultiThreadedSelfTest extends IgniteTxMultiTh @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java index b2b00e0..289fa13 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java @@ -44,7 +44,7 @@ public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingle @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java index 5a072ab..1c82ffd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java @@ -40,7 +40,7 @@ public class GridCachePartitionedTxTimeoutSelfTest extends IgniteTxTimeoutAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionConfiguration(); txCfg.setTxSerializableEnabled(true); txCfg.setDefaultTxTimeout(TIMEOUT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java index eedba16..bd89825 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAbstractReplicatedByteArrayValuesSelfTest.java @@ -34,7 +34,7 @@ public abstract class GridCacheAbstractReplicatedByteArrayValuesSelfTest extends @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); + cfg.getTransactionConfiguration().setTxSerializableEnabled(true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java index 9183864..3336798 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFullApiSelfTest.java @@ -41,7 +41,7 @@ public class GridCacheReplicatedFullApiSelfTest extends GridCacheAbstractFullApi @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/30901e85/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index 711a03e..cfd1b87 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -71,7 +71,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionsConfiguration().setTxSerializableEnabled(true); + c.getTransactionConfiguration().setTxSerializableEnabled(true); TcpDiscoverySpi disco = new TcpDiscoverySpi();
