ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [47/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Date Thu, 19 Feb 2015 21:55:11 GMT
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests

Conflicts:
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java


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

Branch: refs/heads/ignite-sql-tests
Commit: de2b5d3536e06206b588379bd4bb088ace872643
Parents: 9e5ac7c f05f214
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Fri Feb 13 17:28:58 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Fri Feb 13 17:28:58 2015 +0300

----------------------------------------------------------------------
 config/ignite-log4j.xml                         |   2 +-
 examples/pom-standalone.xml                     |  28 +-
 .../org/apache/ignite/cache/CacheManager.java   |  32 +-
 .../apache/ignite/cache/CacheProjection.java    |   4 +-
 .../ignite/cache/cloner/CacheBasicCloner.java   |  34 --
 .../apache/ignite/cache/cloner/CacheCloner.java |  57 ---
 .../ignite/cache/cloner/CacheDeepCloner.java    |  87 ----
 .../org/apache/ignite/cache/cloner/package.html |  24 -
 .../store/jdbc/CacheAbstractJdbcStore.java      | 100 ++--
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |   8 +-
 .../configuration/CacheConfiguration.java       |  34 --
 .../configuration/IgniteConfiguration.java      |  28 +-
 .../org/apache/ignite/events/EventType.java     |   2 -
 .../ignite/internal/ClusterMetricsSnapshot.java |  79 +++-
 .../org/apache/ignite/internal/IgnitionEx.java  |   1 +
 .../managers/deployment/GridDeployment.java     |   3 -
 .../deployment/GridDeploymentManager.java       |   3 -
 .../GridDeploymentPerLoaderStore.java           |   3 -
 .../GridDeploymentPerVersionStore.java          |   7 +-
 .../cache/CacheVersionedEntryImpl.java          |   9 -
 .../processors/cache/GridCacheAdapter.java      |  66 ++-
 .../processors/cache/GridCacheAttributes.java   |  13 -
 .../processors/cache/GridCacheContext.java      |  11 +-
 .../cache/GridCacheDeploymentManager.java       |  14 +-
 .../processors/cache/GridCacheEntryEx.java      |   7 +-
 .../processors/cache/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |  48 +-
 .../processors/cache/GridCacheProcessor.java    |   8 +-
 .../cache/GridCacheProjectionImpl.java          |   8 +-
 .../processors/cache/GridCacheProxyImpl.java    |   8 +-
 .../cache/IgniteCacheExpiryPolicy.java          |   6 +
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../distributed/GridDistributedCacheEntry.java  |   3 -
 .../distributed/dht/GridDhtCacheAdapter.java    |  27 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   3 -
 .../dht/atomic/GridDhtAtomicCache.java          |  96 +---
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |   3 -
 .../dht/colocated/GridDhtColocatedCache.java    |   4 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |   3 -
 .../dht/preloader/GridDhtPartitionMap.java      |  32 +-
 .../preloader/GridDhtPartitionsFullMessage.java |  47 +-
 .../dht/preloader/GridDhtPreloader.java         |  18 +-
 .../distributed/near/GridNearCacheAdapter.java  |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |   3 -
 .../cache/distributed/near/GridNearTxLocal.java |  19 +-
 .../cache/local/GridLocalCacheEntry.java        |   3 -
 .../local/atomic/GridLocalAtomicCache.java      |   7 +-
 .../cache/query/GridCacheQueryManager.java      | 112 ++++-
 .../cache/transactions/IgniteTxAdapter.java     |   3 -
 .../portable/GridPortableProcessor.java         |   9 +
 .../portable/os/GridOsPortableProcessor.java    |   5 +
 .../handlers/cache/GridCacheCommandHandler.java |  11 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |   7 +-
 .../util/lang/GridMetadataAwareAdapter.java     |   3 -
 .../ignite/internal/visor/cache/VisorCache.java |  51 --
 .../visor/cache/VisorCacheConfiguration.java    | 170 +++----
 .../visor/cache/VisorCacheTypeMetadata.java     |  16 +
 .../visor/node/VisorGridConfiguration.java      |   2 +-
 .../ignite/lang/IgniteProductVersion.java       |  12 +-
 .../apache/ignite/logger/java/JavaLogger.java   |   3 -
 .../optimized/optimized-classnames.properties   |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   3 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   2 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   8 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |  15 +
 .../discovery/GridDiscoveryManagerSelfTest.java |  31 ++
 .../cache/GridCacheConcurrentMapSelfTest.java   |   4 +-
 ...idCacheConfigurationConsistencySelfTest.java |  12 -
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  23 -
 .../cache/GridCacheOffHeapSelfTest.java         |  46 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   8 +-
 .../cache/GridCacheVersionMultinodeTest.java    | 208 +++++++++
 ...IgniteCacheAbstractExecutionContextTest.java |  96 ++++
 .../IgniteCacheAtomicExecutionContextTest.java  |  49 ++
 ...iteCachePartitionedExecutionContextTest.java |  49 ++
 ...niteCacheReplicatedExecutionContextTest.java |  49 ++
 .../IgniteCacheTxExecutionContextTest.java      |  49 ++
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  20 +
 .../product/GridProductVersionSelfTest.java     |  20 +
 .../junits/logger/GridTestLog4jLogger.java      |   3 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   9 +
 .../testsuites/IgniteLangSelfTestSuite.java     |   1 -
 .../core/src/test/webapp/META-INF/gg-config.xml | 349 --------------
 .../webapp/META-INF/ignite-webapp-config.xml    | 349 ++++++++++++++
 modules/core/src/test/webapp/WEB-INF/web.xml    |   6 +-
 .../tests/p2p/CacheDeploymentTestValue.java     |   2 +-
 .../fs/hadoop/GridGgfsHadoopJclLogger.java      |   3 -
 .../GridHadoopExternalCommunication.java        |   3 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  23 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  40 +-
 .../query/h2/GridH2IndexRebuildTest.java        |  10 +-
 .../ignite/logger/jcl/IgniteJclLogger.java      |   3 -
 .../IgniteLog4jDailyRollingFileAppender.java    |  77 ---
 ...IgniteLog4jExternallyRolledFileAppender.java |  63 ---
 .../logger/log4j/IgniteLog4jFileAppender.java   | 107 -----
 .../logger/log4j/IgniteLog4jFileAware.java      |  32 --
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |  64 ---
 .../log4j/IgniteLog4jRollingFileAppender.java   |  90 ----
 .../log4j/Log4JDailyRollingFileAppender.java    |  77 +++
 .../Log4JExternallyRolledFileAppender.java      |  63 +++
 .../ignite/logger/log4j/Log4JFileAppender.java  | 107 +++++
 .../apache/ignite/logger/log4j/Log4JLogger.java |  12 +-
 .../ignite/logger/log4j/Log4jFileAware.java     |  32 ++
 .../logger/log4j/Log4jNodeIdFilePath.java       |  64 +++
 .../logger/log4j/Log4jRollingFileAppender.java  |  90 ++++
 .../log4j/GridLog4jCorrectFileNameTest.java     |  12 +-
 .../processors/schedule/ScheduleFutureImpl.java |   3 -
 .../ignite/logger/slf4j/GridSlf4jLogger.java    |   3 -
 .../commands/cache/VisorCacheCommand.scala      |  11 +-
 .../ignite/cache/websession/GridWebSession.java | 286 ------------
 .../cache/websession/GridWebSessionFilter.java  | 466 -------------------
 .../websession/GridWebSessionListener.java      | 196 --------
 .../cache/websession/IgniteWebSession.java      | 286 ++++++++++++
 .../websession/IgniteWebSessionFilter.java      | 466 +++++++++++++++++++
 .../websession/IgniteWebSessionListener.java    | 196 ++++++++
 .../internal/websession/WebSessionSelfTest.java |   8 +-
 .../websession/WebSessionServerStart.java       |   2 +-
 .../internal/websession/WebSessionTest.java     |   2 +-
 pom.xml                                         |  50 +-
 119 files changed, 3028 insertions(+), 2744 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index e80764a,6105f26..63be89b
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -20,8 -20,8 +20,7 @@@ package org.apache.ignite.configuration
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
- import org.apache.ignite.cache.cloner.*;
  import org.apache.ignite.cache.eviction.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cache.store.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.spi.indexing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index 53de1fe,99d7578..8d601b1
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@@ -20,9 -20,9 +20,10 @@@ package org.apache.ignite.internal.proc
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
----------------------------------------------------------------------
diff --cc modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
index 0000000,a254173..9739822
mode 000000,100644..100644
--- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
+++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
@@@ -1,0 -1,349 +1,349 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ 
+ <!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+ 
+ <!--
+     Ignite Spring configuration file to startup grid cache.
+ 
+     When starting a standalone Ignite node, you need to execute the following command:
+     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/spring-cache.xml
+ 
+     When starting Ignite from Java IDE, pass path to this file into Ignition:
+     Ignition.start("examples/config/spring-cache.xml");
+ -->
+ <beans xmlns="http://www.springframework.org/schema/beans"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:util="http://www.springframework.org/schema/util"
+        xsi:schemaLocation="
+         http://www.springframework.org/schema/beans
+         http://www.springframework.org/schema/beans/spring-beans.xsd
+         http://www.springframework.org/schema/util
+         http://www.springframework.org/schema/util/spring-util.xsd">
+     <!--
+         Configuration below demonstrates how to setup caches within grid nodes.
+     -->
+     <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+         <property name="deploymentMode" value="SHARED"/>
+ 
+         <!--
+             For better performance set this property to false in case
+             peer deployment is not used.
+             Default value is false.
+         -->
+         <property name="peerClassLoadingEnabled" value="true"/>
+ 
+         <!--
+             Configure optimized marshaller.
+         -->
+         <property name="marshaller">
+             <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+                 <!--
+                     For better performance set this property to true in case
+                     all marshalled classes implement java.io.Serializable.
+                     Default value is true.
+ 
+                     Note, that it is recommended to implement java.io.Externalizable
+                     instead of java.io.Serializable for smaller network footprint
+                     and even better performance.
+                 -->
+                 <property name="requireSerializable" value="false"/>
+             </bean>
+         </property>
+ 
+         <!-- Set to local host address just for examples. -->
+         <property name="localHost" value="127.0.0.1"/>
+ 
+         <!-- Configure REST TCP server address. -->
+         <property name="connectorConfiguration">
+             <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
+                 <property name="host" value="127.0.0.1"/>
+             </bean>
+         </property>
+ 
+         <!--
+             Enable cache events.
+         -->
+         <property name="includeEventTypes">
+             <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/>
+         </property>
+ 
+         <property name="cacheConfiguration">
+             <!--
+                 Specify list of cache configurations here. Any property from
+                 CacheConfiguration interface can be configured here.
+                 Note that absolutely all configuration properties are optional.
+             -->
+             <list>
+                 <!--
+                     Partitioned cache example configuration (Atomic mode).
+                 -->
+                 <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                     <property name="name" value="partitioned"/>
+ 
+                     <property name="cacheMode" value="PARTITIONED"/>
+ 
+                     <!-- Only atomic updates will be supported. -->
+                     <property name="atomicityMode" value="ATOMIC"/>
+ 
+                     <!-- Enable primary sync write mode. -->
+                     <property name="writeSynchronizationMode" value="PRIMARY_SYNC"/>
+ 
+                     <!-- Disable near cache in atomic mode. -->
+                     <property name="distributionMode" value="PARTITIONED_ONLY"/>
+ 
+                     <!-- Initial cache size. -->
+                     <property name="startSize" value="1500000"/>
+ 
+                     <!--
+                         For better performance set this property to false in case
+                         cache queries are not used.
+                         Default value is false.
+                     -->
+                     <property name="queryIndexEnabled" value="true"/>
+ 
+                     <!-- Allow to index primitive values. -->
+                     <property name="queryConfiguration">
 -                        <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration">
++                        <bean class="org.apache.ignite.cache.query.QueryConfiguration">
+                             <!-- Index primitives. -->
+                             <property name="indexPrimitiveKey" value="true"/>
+                         </bean>
+                     </property>
+ 
+                     <!--
+                         This shows how to configure number of backups. The below configuration
+                         sets the number of backups to 1 (which is default).
+                     -->
+                     <property name="backups" value="1"/>
+ 
+                     <!-- Set synchronous preloading (default is asynchronous). -->
+                     <property name="preloadMode" value="SYNC"/>
+                 </bean>
+ 
+                 <!--
+                     Partitioned cache example configuration (Transactional mode).
+                 -->
+                 <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                     <property name="name" value="partitioned_tx"/>
+ 
+                     <property name="cacheMode" value="PARTITIONED"/>
+ 
+                     <!-- Transactional updates supported. -->
+                     <property name="atomicityMode" value="TRANSACTIONAL"/>
+ 
+                     <!-- Enable near cache to cache recently accessed data. -->
+                     <property name="distributionMode" value="NEAR_PARTITIONED"/>
+ 
+                     <!-- Initial cache size. -->
+                     <property name="startSize" value="1500000"/>
+ 
+                     <!--
+                         Setting this value will cause local node to wait for remote commits.
+                         However, it's important to set it this way in the examples as we
assert on
+                         conditions that usually assume full completion of transactions on
all nodes.
+                     -->
+                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+ 
+                     <!--
+                         For better performance set this property to false in case
+                         cache queries are not used.
+                         Default value is false.
+                     -->
+                     <property name="queryIndexEnabled" value="true"/>
+ 
+                     <!-- Allow to index primitive values. -->
+                     <property name="queryConfiguration">
 -                        <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration">
++                        <bean class="org.apache.ignite.cache.query.QueryConfiguration">
+                             <!-- Index primitives. -->
+                             <property name="indexPrimitiveKey" value="true"/>
+                         </bean>
+                     </property>
+ 
+                     <!--
+                         This shows how to configure number of backups. The below configuration
+                         sets the number of backups to 1 (which is default).
+                     -->
+                     <property name="backups" value="1"/>
+ 
+                     <!-- Set synchronous preloading (default is asynchronous). -->
+                     <property name="preloadMode" value="SYNC"/>
+                 </bean>
+ 
+                 <!--
+                     Replicated cache example configuration.
+                 -->
+                 <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                     <property name="name" value="replicated"/>
+ 
+                     <!--
+                         Setting this value will cause local node to wait for remote commits.
+                         However, it's important to set it this way in the examples as we
assert on
+                         conditions that usually assume full completion of transactions on
all nodes.
+                     -->
+                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+ 
+                     <!-- REPLICATED cache mode. -->
+                     <property name="cacheMode" value="REPLICATED"/>
+ 
+                     <!-- Set synchronous preloading (default is asynchronous). -->
+                     <property name="preloadMode" value="SYNC"/>
+ 
+                     <!-- Initial cache size. -->
+                     <property name="startSize" value="150000"/>
+ 
+                     <!--
+                         For better performance set this property to false in case
+                         cache queries are not used.
+                         Default value is false.
+                     -->
+                     <property name="queryIndexEnabled" value="true"/>
+ 
+                     <!-- Allow to index primitive values. -->
+                     <property name="queryConfiguration">
 -                        <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration">
++                        <bean class="org.apache.ignite.cache.query.QueryConfiguration">
+                             <!-- Index primitives. -->
+                             <property name="indexPrimitiveKey" value="true"/>
+                         </bean>
+                     </property>
+                 </bean>
+ 
+                 <!--
+                     Local cache example configuration.
+                 -->
+                 <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                     <!-- Cache name is 'local'. -->
+                     <property name="name" value="local"/>
+ 
+                     <!-- LOCAL cache mode. -->
+                     <property name="cacheMode" value="LOCAL"/>
+ 
+                     <!-- Initial cache size. -->
+                     <property name="startSize" value="150000"/>
+ 
+                     <!--
+                         For better performance set this property to false in case
+                         cache queries are not used.
+                         Default value is false.
+                     -->
+                     <property name="queryIndexEnabled" value="true"/>
+ 
+                     <!-- Allow to index primitive values. -->
+                     <property name="queryConfiguration">
 -                        <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration">
++                        <bean class="org.apache.ignite.cache.query.QueryConfiguration">
+                             <!-- Index primitives. -->
+                             <property name="indexPrimitiveKey" value="true"/>
+                         </bean>
+                     </property>
+                 </bean>
+             </list>
+         </property>
+ 
+         <!--
+             Uncomment this to provide TCP discovery SPI (Amazon EC2).
+         -->
+         <!--
+         <property name="discoverySpi">
+             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                 <property name="ipFinder">
+                     <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinder">
+                         <property name="awsCredentials">
+                             <bean class="com.amazonaws.auth.BasicAWSCredentials">
+                                 <constructor-arg value="YOUR_ACCESS_KEY_ID" />
+                                 <constructor-arg value="YOUR_SECRET_ACCESS_KEY" />
+                             </bean>
+                         </property>
+                         <property name="bucketName" value="YOUR_BUCKET_NAME_IP_FINDER"/>
+                     </bean>
+                 </property>
+                 <property name="heartbeatFrequency" value="2000"/>
+             </bean>
+         </property>
+         -->
+ 
+         <!--
+             Uncomment this to provide TCP discovery SPI (Local network).
+ 
+             If path to shared file system is not explicitly provided,
+             then only local nodes will be able to discover each other.
+         -->
+         <!--
+         <property name="discoverySpi">
+             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                 <property name="ipFinder">
+                     <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder">
+                         <property name="path" value="work/disco/tcp"/>
+                     </bean>
+                 </property>
+             </bean>
+         </property>
+         -->
+ 
+         <!--
+             TCP discovery SPI configuration with predefined addresses.
+             Use the addresses list to provide IP addresses of initial nodes in the grid
+             (at least one address must be provided).
+ 
+             Note:
+             =====
+             If running in distributed environment, you should change IP addresses to the
actual IP addresses
+             of the servers on your network. Not all addresses need to be specified, only
the addresses
+             of one or more servers which will always be started first.
+         -->
+         <property name="discoverySpi">
+             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                 <property name="ipFinder">
+                     <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+                         <property name="addresses">
+                             <list>
+                                 <!--
+                                     List all IP/port configurations that potentially
+                                     can be started first in examples. We are assuming
+                                     grid of size 10 or less.
+                                 -->
+                                 <value>127.0.0.1:47500</value>
+                                 <value>127.0.0.1:47501</value>
+                                 <value>127.0.0.1:47502</value>
+                                 <value>127.0.0.1:47503</value>
+                                 <value>127.0.0.1:47504</value>
+                                 <value>127.0.0.1:47505</value>
+                                 <value>127.0.0.1:47506</value>
+                                 <value>127.0.0.1:47507</value>
+                                 <value>127.0.0.1:47508</value>
+                                 <value>127.0.0.1:47509</value>
+                             </list>
+                         </property>
+                     </bean>
+                     <!--
+                     Uncomment this to provide IP finder using multicast for nodes discovery.
+                     In addition to addresses received via multicast this finder can work
with pre-configured
+                     list of addresses.
+                     -->
+                     <!--
+                     <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+                         <property name="addresses">
+                             <list>
+                                 <value>host1:port1</value>
+                                 <value>host2:port2</value>
+                             </list>
+                         </property>
+                     </bean>
+                     -->
+                 </property>
+             </bean>
+         </property>
+     </bean>
+ </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de2b5d35/pom.xml
----------------------------------------------------------------------


Mime
View raw message