sprint-1 - Moved cache configuration to configuration package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dac60c38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dac60c38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dac60c38 Branch: refs/heads/ignite-188 Commit: dac60c38aad4cfec2edde99491f7b4507c0a8556 Parents: 6b46a52 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Thu Feb 5 18:57:57 2015 -0800 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Thu Feb 5 18:57:59 2015 -0800 ---------------------------------------------------------------------- config/fabric/default-config.xml | 6 +- config/hadoop/default-config.xml | 8 +- examples/config/example-cache.xml | 2 +- examples/config/filesystem/example-ignitefs.xml | 4 +- .../store/CacheNodeWithStoreStartup.java | 1 - .../MemcacheRestExampleNodeStartup.java | 1 - .../ClientAbstractMultiThreadedSelfTest.java | 1 - .../client/ClientTopologyCacheSelfTest.java | 1 - .../rest/RestBinaryProtocolSelfTest.java | 1 - .../rest/RestMemcacheProtocolSelfTest.java | 1 - .../rest/TaskCommandHandlerSelfTest.java | 1 - .../ignite/jdbc/JdbcConnectionSelfTest.java | 1 - .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 1 - .../clients/src/test/resources/spring-cache.xml | 6 +- .../src/test/resources/spring-server-node.xml | 10 +- .../test/resources/spring-server-ssl-node.xml | 8 +- .../java/org/apache/ignite/IgniteCache.java | 6 +- .../java/org/apache/ignite/IgnitePortables.java | 3 +- .../org/apache/ignite/IgniteTransactions.java | 1 - .../apache/ignite/cache/CacheAtomicityMode.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 1726 ------------------ .../ignite/cache/CacheDistributionMode.java | 6 +- .../apache/ignite/cache/CacheInterceptor.java | 2 +- .../org/apache/ignite/cache/CacheMetrics.java | 2 +- .../java/org/apache/ignite/cache/CacheMode.java | 4 +- .../apache/ignite/cache/CachePreloadMode.java | 4 +- .../apache/ignite/cache/CacheProjection.java | 14 +- .../cache/CacheWriteSynchronizationMode.java | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 3 +- .../ignite/cache/affinity/CacheAffinity.java | 37 +- .../cache/affinity/CacheAffinityFunction.java | 3 +- .../cache/affinity/CacheAffinityKeyMapper.java | 4 +- .../CacheConsistentHashAffinityFunction.java | 3 +- .../fair/CachePartitionFairAffinity.java | 3 +- .../CacheRendezvousAffinityFunction.java | 3 +- .../apache/ignite/cache/cloner/CacheCloner.java | 7 +- .../cache/eviction/CacheEvictionFilter.java | 2 +- .../eviction/fifo/CacheFifoEvictionPolicy.java | 1 + .../eviction/lru/CacheLruEvictionPolicy.java | 1 + .../random/CacheRandomEvictionPolicy.java | 1 + .../apache/ignite/cache/store/CacheStore.java | 7 +- .../org/apache/ignite/cluster/ClusterGroup.java | 4 +- .../configuration/CacheConfiguration.java | 1726 ++++++++++++++++++ .../configuration/IgniteConfiguration.java | 1 - .../ignite/internal/ClusterGroupAdapter.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 1 - .../internal/processors/cache/CacheFlag.java | 4 +- .../processors/cache/GridCacheAttributes.java | 3 +- .../GridCacheDefaultAffinityKeyMapper.java | 3 +- .../cache/GridCacheEvictionManager.java | 1 + .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 1 + .../processors/cache/GridCacheStoreManager.java | 2 +- .../processors/cache/GridCacheTtlManager.java | 3 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 1 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 1 + .../cache/jta/CacheJtaManagerAdapter.java | 2 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../dataload/GridDataLoadCacheUpdaters.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 1 - .../internal/processors/fs/IgniteFsHelper.java | 2 +- .../processors/fs/IgniteFsHelperImpl.java | 2 +- .../processors/fs/IgniteFsNoopHelper.java | 2 +- .../processors/query/GridQueryProcessor.java | 1 + .../ignite/internal/visor/cache/VisorCache.java | 1 + .../cache/VisorCacheAffinityConfiguration.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 1 + .../cache/VisorCacheDefaultConfiguration.java | 2 +- .../visor/cache/VisorCacheDgcConfiguration.java | 2 +- .../cache/VisorCacheEvictionConfiguration.java | 2 +- .../cache/VisorCacheNearConfiguration.java | 2 +- .../cache/VisorCachePreloadConfiguration.java | 1 + .../cache/VisorCacheStoreConfiguration.java | 2 +- .../VisorCacheWriteBehindConfiguration.java | 2 +- .../resources/IgniteCacheNameResource.java | 8 +- .../apache/ignite/transactions/IgniteTx.java | 3 +- .../spring-cache-client-benchmark-1.xml | 2 +- .../spring-cache-client-benchmark-2.xml | 2 +- .../spring-cache-client-benchmark-3.xml | 2 +- .../core/src/test/config/discovery-stress.xml | 2 +- modules/core/src/test/config/example-cache.xml | 2 +- modules/core/src/test/config/ggfs-loopback.xml | 4 +- modules/core/src/test/config/ggfs-shmem.xml | 4 +- .../src/test/config/load/cache-benchmark.xml | 4 +- .../test/config/load/cache-client-benchmark.xml | 4 +- .../config/load/dsi-49-server-production.xml | 4 +- .../src/test/config/load/dsi-load-client.xml | 4 +- .../src/test/config/load/dsi-load-server.xml | 4 +- .../core/src/test/config/spring-cache-load.xml | 2 +- .../config/spring-cache-put-remove-load.xml | 2 +- .../core/src/test/config/spring-cache-swap.xml | 2 +- .../src/test/config/spring-cache-teststore.xml | 2 +- .../core/src/test/config/spring-multicache.xml | 16 +- .../test/config/websession/spring-cache-1.xml | 6 +- .../test/config/websession/spring-cache-2.xml | 6 +- .../test/config/websession/spring-cache-3.xml | 6 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 2 +- .../GridGgfsEventsAbstractSelfTest.java | 1 - .../ignite/internal/GridAffinityMappedTest.java | 1 - .../internal/GridAffinityP2PSelfTest.java | 1 - .../ignite/internal/GridAffinitySelfTest.java | 1 - .../GridJobMasterLeaveAwareSelfTest.java | 1 - .../internal/GridMultipleJobsSelfTest.java | 1 - ...ectionLocalJobMultipleArgumentsSelfTest.java | 1 - .../ignite/internal/GridStartStopSelfTest.java | 1 - .../IgniteComputeEmptyClusterGroupTest.java | 1 - .../GridCheckpointManagerAbstractSelfTest.java | 1 - .../checkpoint/GridCheckpointTaskSelfTest.java | 1 - .../GridDiscoveryManagerAliveCacheSelfTest.java | 1 - .../cache/GridCacheAbstractFlagsTest.java | 1 + .../GridCacheAbstractProjectionSelfTest.java | 2 - .../cache/GridCacheAffinityApiSelfTest.java | 1 + .../GridCacheAsyncOperationsLimitSelfTest.java | 2 +- ...ridCacheConfigurationValidationSelfTest.java | 1 - .../GridCacheDeploymentOffHeapSelfTest.java | 2 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 1 - ...CacheFullTextQueryMultithreadedSelfTest.java | 1 + ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 2 +- .../cache/GridCacheMvccFlagsTest.java | 1 - .../cache/GridCacheMvccPartitionedSelfTest.java | 1 - .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...HeapMultiThreadedUpdateAbstractSelfTest.java | 1 + .../GridCacheQueryIndexingDisabledSelfTest.java | 1 + .../GridCacheQueryInternalKeysSelfTest.java | 1 + .../cache/GridCacheStoreValueBytesSelfTest.java | 2 +- .../cache/GridCacheSwapReloadSelfTest.java | 1 - ...idCacheValueConsistencyAbstractSelfTest.java | 1 + .../IgniteCacheEntryListenerAbstractTest.java | 1 + ...eAbstractDataStructuresFailoverSelfTest.java | 1 - .../GridCacheSequenceApiSelfAbstractTest.java | 1 - .../IgniteAtomicLongApiAbstractSelfTest.java | 1 - ...GridCachePartitionedNodeRestartSelfTest.java | 1 - ...idCachePartitionedNodeRestartTxSelfTest.java | 1 - .../GridCacheAbstractNodeRestartSelfTest.java | 2 +- .../GridCacheClientModesAbstractSelfTest.java | 1 + ...acheEntrySetIterationPreloadingSelfTest.java | 1 + ...heExpiredEntriesPreloadAbstractSelfTest.java | 1 + ...GridCachePreloadRestartAbstractSelfTest.java | 2 +- .../IgniteTxPreloadAbstractTest.java | 2 +- ...heAbstractTransformWriteThroughSelfTest.java | 1 - .../dht/GridCacheAtomicFullApiSelfTest.java | 1 + .../dht/GridCacheColocatedDebugTest.java | 1 - .../GridCacheDhtAtomicRemoveFailureTest.java | 1 + .../dht/GridCacheDhtEntrySetSelfTest.java | 1 + .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java | 2 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +- .../dht/GridCacheDhtRemoveFailureTest.java | 1 + .../dht/GridCacheDhtTxPreloadSelfTest.java | 1 + ...idCachePartitionedPreloadEventsSelfTest.java | 1 + ...itionedTxOriginatingNodeFailureSelfTest.java | 1 + ...unctionExcludeNeighborsAbstractSelfTest.java | 1 - ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 1 + ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 1 + ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 1 + ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 1 + .../GridCacheAtomicNearRemoveFailureTest.java | 1 + .../GridCacheAtomicOffHeapFullApiSelfTest.java | 1 + ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 1 + ...idCacheAtomicPartitionedMetricsSelfTest.java | 2 +- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 1 + .../near/GridCacheNearMetricsSelfTest.java | 1 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 + .../near/GridCacheNearRemoveFailureTest.java | 1 + .../near/GridCacheNearTxPreloadSelfTest.java | 1 + ...AffinityExcludeNeighborsPerformanceTest.java | 1 - ...rtitionedAffinityHashIdResolverSelfTest.java | 1 - .../near/GridCachePartitionedBasicApiTest.java | 1 - .../near/GridCachePartitionedEventSelfTest.java | 1 + .../GridCachePartitionedEvictionSelfTest.java | 1 - .../GridCachePartitionedMetricsSelfTest.java | 1 - ...achePartitionedMultiNodeFullApiSelfTest.java | 1 + ...idCachePartitionedMultiNodeLockSelfTest.java | 1 - .../near/GridCachePartitionedNestedTxTest.java | 1 - .../GridCachePartitionedNodeRestartTest.java | 1 - ...ePartitionedOptimisticTxNodeRestartTest.java | 1 - .../GridCachePartitionedProjectionSelfTest.java | 1 + ...GridCachePartitionedTxConcurrentGetTest.java | 1 - ...GridCachePartitionedTxMultiNodeSelfTest.java | 1 - ...CachePartitionedTxMultiThreadedSelfTest.java | 1 - .../GridCachePartitionedTxTimeoutSelfTest.java | 1 - .../near/GridCachePutArrayValueSelfTest.java | 1 + ...stractReplicatedByteArrayValuesSelfTest.java | 1 - ...ridCacheAtomicReplicatedMetricsSelfTest.java | 2 +- ...eplicatedAtomicMultiNodeFullApiSelfTest.java | 1 + .../GridCacheReplicatedBasicApiTest.java | 1 - .../GridCacheReplicatedBasicOpSelfTest.java | 1 - .../GridCacheReplicatedClientOnlySelfTest.java | 1 + .../GridCacheReplicatedEvictionSelfTest.java | 1 + .../GridCacheReplicatedMarshallerTxTest.java | 1 - .../GridCacheReplicatedMetricsSelfTest.java | 1 - ...ridCacheReplicatedMultiNodeLockSelfTest.java | 1 - .../GridCacheReplicatedMultiNodeSelfTest.java | 1 - .../GridCacheReplicatedNearOnlySelfTest.java | 1 + .../GridCacheReplicatedNodeFailureSelfTest.java | 1 - .../GridCacheReplicatedNodeRestartSelfTest.java | 1 - ...dezvousAffinityMultiNodeFullApiSelfTest.java | 2 +- .../GridCacheReplicatedTxConcurrentGetTest.java | 1 - ...GridCacheReplicatedTxMultiNodeBasicTest.java | 1 - ...dCacheReplicatedTxMultiThreadedSelfTest.java | 1 - ...CacheReplicatedTxSingleThreadedSelfTest.java | 1 - .../GridCacheReplicatedTxTimeoutSelfTest.java | 1 - .../GridCacheSyncReplicatedPreloadSelfTest.java | 1 - ...idCacheReplicatedPreloadOffHeapSelfTest.java | 2 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 1 - .../GridCacheBatchEvictUnswapSelfTest.java | 1 + ...cheSynchronousEvictionsFailoverSelfTest.java | 1 + .../IgniteCacheExpiryPolicyAbstractTest.java | 1 + .../IgniteCacheLoadAllAbstractTest.java | 2 +- .../IgniteCacheStoreSessionAbstractTest.java | 1 - .../GridCacheAtomicLocalMetricsSelfTest.java | 2 +- .../local/GridCacheLocalBasicApiSelfTest.java | 1 - .../local/GridCacheLocalLoadAllSelfTest.java | 1 - .../cache/local/GridCacheLocalLockSelfTest.java | 1 - .../local/GridCacheLocalMetricsSelfTest.java | 1 - .../GridCacheLocalMultithreadedSelfTest.java | 1 - .../GridCacheLocalTxMultiThreadedSelfTest.java | 1 - .../GridCacheLocalTxSingleThreadedSelfTest.java | 1 - .../dataload/GridDataLoaderPerformanceTest.java | 1 - .../fs/GridGgfsMetaManagerSelfTest.java | 1 - .../fs/GridGgfsProcessorValidationSelfTest.java | 1 - .../GridGgfsAbstractRecordResolverSelfTest.java | 1 - .../util/future/GridEmbeddedFutureSelfTest.java | 2 +- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 1 - .../loadtests/GridCacheMultiNodeLoadTest.java | 1 - .../capacity/spring-capacity-cache.xml | 2 +- .../loadtests/colocation/spring-colocation.xml | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 1 - .../session/GridSessionCheckpointSelfTest.java | 1 - .../GridCacheStoreValueBytesNode.java | 1 - .../testframework/junits/GridAbstractTest.java | 1 - .../core/src/test/webapp/META-INF/gg-config.xml | 8 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 1 - ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 1 - .../hadoop/GridHadoopAbstractSelfTest.java | 1 - .../hibernate/GridHibernateL2CacheSelfTest.java | 2 - ...idHibernateL2CacheTransactionalSelfTest.java | 1 + ...GridCachePartitionedFieldsQuerySelfTest.java | 1 + .../tcp/GridOrderedMessageCancelSelfTest.java | 1 - .../apache/ignite/cache/jta/CacheTmLookup.java | 2 +- .../processors/cache/jta/CacheJtaManager.java | 1 - ...CacheJtaConfigurationValidationSelfTest.java | 1 - .../scalar/src/test/resources/spring-cache.xml | 2 +- .../cache/VisorCacheClearCommandSpec.scala | 3 +- .../cache/VisorCacheCompactCommandSpec.scala | 3 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- .../cache/websession/GridWebSessionFilter.java | 1 + modules/yardstick/config/ignite-base-config.xml | 18 +- .../yardstick/config/ignite-store-config.xml | 4 +- 254 files changed, 1970 insertions(+), 2028 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/config/fabric/default-config.xml ---------------------------------------------------------------------- diff --git a/config/fabric/default-config.xml b/config/fabric/default-config.xml index 90bc72f..f6e1c28 100644 --- a/config/fabric/default-config.xml +++ b/config/fabric/default-config.xml @@ -40,7 +40,7 @@ <!-- Local cache configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> </bean> @@ -48,7 +48,7 @@ <!-- Replicated cache configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="replicated"/> <property name="cacheMode" value="REPLICATED"/> </bean> @@ -56,7 +56,7 @@ <!-- Partitioned cache configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="local"/> <property name="cacheMode" value="LOCAL"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index fcb31e2..9a2ab3c 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -64,7 +64,7 @@ <!-- Abstract cache configuration for GGFS file data to be used as a template. --> - <bean id="dataCacheCfgBase" class="org.apache.ignite.cache.CacheConfiguration" abstract="true"> + <bean id="dataCacheCfgBase" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> @@ -80,7 +80,7 @@ <!-- Abstract cache configuration for GGFS metadata to be used as a template. --> - <bean id="metaCacheCfgBase" class="org.apache.ignite.cache.CacheConfiguration" abstract="true"> + <bean id="metaCacheCfgBase" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> @@ -135,12 +135,12 @@ <property name="cacheConfiguration"> <list> <!-- File system metadata cache. --> - <bean class="org.apache.ignite.cache.CacheConfiguration" parent="metaCacheCfgBase"> + <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="metaCacheCfgBase"> <property name="name" value="ggfs-meta"/> </bean> <!-- File system files data cache. --> - <bean class="org.apache.ignite.cache.CacheConfiguration" parent="dataCacheCfgBase"> + <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="dataCacheCfgBase"> <property name="name" value="ggfs-data"/> </bean> </list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 23a0a8d..8b37bcb 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -126,7 +126,7 @@ </bean> <!-- Template for all example cache configurations. --> - <bean id="cache-template" abstract="true" class="org.apache.ignite.cache.CacheConfiguration"> + <bean id="cache-template" abstract="true" class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Initial cache size. --> <property name="startSize" value="3000000"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/examples/config/filesystem/example-ignitefs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ignitefs.xml b/examples/config/filesystem/example-ignitefs.xml index ba136f5..b6fab71 100644 --- a/examples/config/filesystem/example-ignitefs.xml +++ b/examples/config/filesystem/example-ignitefs.xml @@ -113,7 +113,7 @@ <property name="cacheConfiguration"> <list> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="ignitefs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -129,7 +129,7 @@ </property> </bean> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="ignitefs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java index 4f0c654..0c87f84 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -18,7 +18,6 @@ package org.apache.ignite.examples.datagrid.store; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.examples.datagrid.store.dummy.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index e37f028..b9bd586 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -18,7 +18,6 @@ package org.apache.ignite.examples.misc.client.memcache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java index 429dc94..f4d8fb6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.client; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.client.balancer.*; import org.apache.ignite.client.impl.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java index df61aec..968f4fd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.client; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 3d6ba9c..68db16a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.rest; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index 489c7bd..53c8156 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest; import junit.framework.*; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 7a224b3..ef65ef0 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.rest; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.client.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java index 733714e..c79b86b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.jdbc; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index daac5f8..03562a2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -17,7 +17,6 @@ package org.apache.ignite.jdbc; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index a2e62a9..ed1ac64 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -62,7 +62,7 @@ <!-- Partitioned cache example configuration (Transactional mode). --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="partitioned"/> <property name="cacheMode" value="PARTITIONED"/> @@ -111,7 +111,7 @@ <!-- Replicated cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="replicated"/> <property name="atomicityMode" value="TRANSACTIONAL"/> @@ -136,7 +136,7 @@ <!-- Local cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'local'. --> <property name="name" value="local"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 09bc93a..47a9bf1 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -113,7 +113,7 @@ <!-- Local cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is null. --> <!--<property name="name"><null/></property>--> @@ -126,7 +126,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'partitioned'. --> <property name="name" value="partitioned"/> @@ -209,7 +209,7 @@ <!-- Local cache with store. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="local.store"/> <property name="cacheMode" value="LOCAL"/> @@ -226,7 +226,7 @@ <!-- Replicated cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'replicated'. --> <property name="name" value="replicated"/> @@ -241,7 +241,7 @@ <!-- Replicated cache with in-memory store enabled. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'replicated.store'. --> <property name="name" value="replicated.store"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index 4628d14..7769436 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -97,7 +97,7 @@ <!-- Local cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is null. --> <!--<property name="name"><null/></property>--> @@ -110,7 +110,7 @@ <!-- Partitioned cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'partitioned'. --> <property name="name" value="partitioned"/> @@ -193,7 +193,7 @@ <!-- Replicated cache example configuration. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'replicated'. --> <property name="name" value="replicated"/> @@ -208,7 +208,7 @@ <!-- Replicated cache with in-memory store enabled. --> - <bean class="org.apache.ignite.cache.CacheConfiguration"> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> <!-- Cache name is 'replicated.store'. --> <property name="name" value="replicated.store"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/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 bea85dc..d3d32c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -214,7 +214,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * that entry will be evicted only if it's not used (not * participating in any locks or transactions). * <p> - * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and + * 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 entry will * be swapped to offheap, and then to disk. * <h2 class="header">Cache Flags</h2> @@ -261,7 +261,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * 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 CacheConfiguration#isSwapEnabled()} is set to {@code true} and + * 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> @@ -341,7 +341,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * </pre> * <p> * Note that this method makes sense only if cache is working in portable mode - * ({@link CacheConfiguration#isPortableEnabled()} returns {@code true}. If not, + * ({@link org.apache.ignite.configuration.CacheConfiguration#isPortableEnabled()} returns {@code true}. If not, * this method is no-op and will return current projection. * * @return Projection for portable objects. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java index bb13bb0..eef6cba 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java +++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java @@ -17,7 +17,6 @@ package org.apache.ignite; -import org.apache.ignite.cache.*; import org.apache.ignite.portables.*; import org.jetbrains.annotations.*; @@ -254,7 +253,7 @@ import java.util.Date; * or for a specific type via {@link org.apache.ignite.portables.PortableTypeConfiguration} instance. * <h1 class="header">Query Indexing</h1> * Portable objects can be indexed for querying by specifying index fields in - * {@link org.apache.ignite.cache.CacheTypeMetadata} inside of specific {@link CacheConfiguration} instance, + * {@link org.apache.ignite.cache.CacheTypeMetadata} inside of specific {@link org.apache.ignite.configuration.CacheConfiguration} instance, * like so: * <pre name=code class=xml> * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/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 08799aa..4422d80 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java @@ -17,7 +17,6 @@ package org.apache.ignite; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dac60c38/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java index 66488a0..f81ebbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.*; * used whenever transactions and explicit locking are not needed. Note that in {@link #ATOMIC} * mode cache will still maintain full data consistency across all cache nodes. * <p> - * Cache atomicity may be set via {@link CacheConfiguration#getAtomicityMode()} + * Cache atomicity may be set via {@link org.apache.ignite.configuration.CacheConfiguration#getAtomicityMode()} * configuration property. */ public enum CacheAtomicityMode {
