Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-111
Conflicts:
modules/core/src/test/config/load/mongo-multinode-foster.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/507066f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/507066f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/507066f6
Branch: refs/heads/ignite-57
Commit: 507066f6c49a2c35f58ead519d7dd2733d38c022
Parents: 110571c 878a289
Author: avinogradov <avinogra...@gridgain.com>
Authored: Wed Feb 4 16:26:21 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Wed Feb 4 16:26:21 2015 +0300
----------------------------------------------------------------------
docs/core-site.ignite.xml | 2 +-
examples/config/example-cache.xml | 14 +-
examples/config/example-compute.xml | 8 +-
examples/config/example-streamer.xml | 30 +-
examples/config/filesystem/core-site.xml | 10 +-
examples/config/filesystem/example-ggfs.xml | 165 -----------
examples/config/filesystem/example-ignitefs.xml | 165 +++++++++++
examples/config/filesystem/readme.txt | 8 +-
.../hibernate/example-hibernate-L2-cache.xml | 6 +-
examples/config/servlet/WEB-INF/web.xml | 2 +-
examples/rest/http-rest-example.php | 8 +-
examples/rest/memcache-rest-example.php | 4 +-
.../ignite/examples/ComputeNodeStartup.java | 4 +-
.../apache/ignite/examples/ExamplesUtils.java | 6 +-
.../compute/ComputeBroadcastExample.java | 34 +--
.../compute/ComputeCallableExample.java | 18 +-
.../examples/compute/ComputeClosureExample.java | 20 +-
.../compute/ComputeContinuousMapperExample.java | 24 +-
.../compute/ComputeExecutorServiceExample.java | 16 +-
.../ComputeFibonacciContinuationExample.java | 35 ++-
.../compute/ComputeProjectionExample.java | 23 +-
.../examples/compute/ComputeReducerExample.java | 20 +-
.../compute/ComputeRunnableExample.java | 17 +-
.../compute/ComputeScheduleExample.java | 14 +-
.../examples/compute/ComputeTaskMapExample.java | 30 +-
.../compute/ComputeTaskSplitExample.java | 26 +-
.../failover/ComputeFailoverExample.java | 17 +-
.../failover/ComputeFailoverNodeStartup.java | 12 +-
.../compute/montecarlo/CreditRiskExample.java | 30 +-
.../compute/montecarlo/CreditRiskManager.java | 14 +-
.../apache/ignite/examples/compute/package.html | 2 +-
.../examples/datagrid/CacheAffinityExample.java | 37 ++-
.../examples/datagrid/CacheApiExample.java | 104 ++-----
.../datagrid/CacheContinuousQueryExample.java | 10 +-
.../datagrid/CacheDataLoaderExample.java | 16 +-
.../examples/datagrid/CacheEventsExample.java | 21 +-
.../examples/datagrid/CacheNodeStartup.java | 4 +-
.../datagrid/CachePopularNumbersExample.java | 32 +--
.../examples/datagrid/CachePutGetExample.java | 29 +-
.../examples/datagrid/CacheQueryExample.java | 26 +-
.../datagrid/CacheTransactionExample.java | 41 ++-
.../datastructures/CacheAtomicLongExample.java | 16 +-
.../CacheAtomicReferenceExample.java | 24 +-
.../CacheAtomicSequenceExample.java | 14 +-
.../CacheAtomicStampedExample.java | 22 +-
.../CacheCountDownLatchExample.java | 16 +-
.../datastructures/CacheQueueExample.java | 46 +--
.../datastructures/CacheSetExample.java | 36 +--
.../hibernate/HibernateL2CacheExample.java | 18 +-
.../HibernateL2CacheExampleNodeStartup.java | 12 +-
.../ignite/examples/datagrid/package.html | 2 +-
.../starschema/CacheStarSchemaExample.java | 57 ++--
.../datagrid/starschema/DimProduct.java | 3 +-
.../examples/datagrid/starschema/DimStore.java | 3 +-
.../datagrid/starschema/FactPurchase.java | 3 +-
.../examples/datagrid/starschema/package.html | 2 +-
.../store/CacheNodeWithStoreStartup.java | 12 +-
.../datagrid/store/CacheStoreExample.java | 17 +-
.../store/CacheStoreLoadDataExample.java | 15 +-
.../store/dummy/CacheDummyPersonStore.java | 9 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 2 +-
.../store/jdbc/CacheJdbcPersonStore.java | 10 +-
.../ignite/examples/events/EventsExample.java | 32 +--
.../ignite/examples/fs/IgniteFsExample.java | 278 +++++++++++++++++++
.../examples/fs/IgniteFsMapReduceExample.java | 249 +++++++++++++++++
.../ignite/examples/fs/IgniteFsNodeStartup.java | 41 +++
.../org/apache/ignite/examples/fs/package.html | 24 ++
.../ignite/examples/ggfs/GgfsExample.java | 278 -------------------
.../examples/ggfs/GgfsMapReduceExample.java | 249 -----------------
.../ignite/examples/ggfs/GgfsNodeStartup.java | 41 ---
.../apache/ignite/examples/ggfs/package.html | 24 --
.../examples/messaging/MessagingExample.java | 36 +--
.../messaging/MessagingPingPongExample.java | 26 +-
.../MessagingPingPongListenActorExample.java | 20 +-
.../client/memcache/MemcacheRestExample.java | 22 +-
.../MemcacheRestExampleNodeStartup.java | 14 +-
.../misc/deployment/DeploymentExample.java | 34 +--
.../misc/lifecycle/LifecycleExample.java | 24 +-
.../misc/springbean/SpringBeanExample.java | 30 +-
.../examples/misc/springbean/package.html | 2 +-
.../examples/misc/springbean/spring-bean.xml | 8 +-
.../org/apache/ignite/examples/package.html | 2 +-
.../examples/services/ServicesExample.java | 16 +-
.../streaming/StreamingCheckInExample.java | 30 +-
.../streaming/StreamingNodeStartup.java | 4 +-
.../StreamingPopularNumbersExample.java | 40 +--
.../streaming/StreamingPriceBarsExample.java | 38 +--
.../StreamingRunningAverageExample.java | 6 +-
.../apache/ignite/examples/ComputeExample.java | 22 +-
.../ignite/examples/MessagingExample.java | 66 +++--
.../examples/ScalarCacheAffinityExample1.scala | 22 +-
.../examples/ScalarCacheAffinityExample2.scala | 18 +-
.../ScalarCacheAffinitySimpleExample.scala | 6 +-
.../scalar/examples/ScalarCacheExample.scala | 4 +-
.../ScalarCachePopularNumbersExample.scala | 26 +-
.../examples/ScalarCacheQueryExample.scala | 20 +-
.../scalar/examples/ScalarClosureExample.scala | 20 +-
.../examples/ScalarContinuationExample.scala | 33 ++-
.../examples/ScalarCreditRiskExample.scala | 22 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 22 +-
.../examples/ScalarPiCalculationExample.scala | 6 +-
.../scalar/examples/ScalarPingPongExample.scala | 14 +-
.../scalar/examples/ScalarPrimeExample.scala | 16 +-
.../scalar/examples/ScalarScheduleExample.scala | 6 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 40 +--
.../scalar/examples/ScalarTaskExample.scala | 14 +-
.../examples/ScalarWorldShortestMapReduce.scala | 2 +-
.../BasicExamplesMultiNodeSelfTest.java | 28 ++
.../ignite/examples/BasicExamplesSelfTest.java | 82 ++++++
.../CacheExamplesMultiNodeSelfTest.java | 48 ++++
.../ignite/examples/CacheExamplesSelfTest.java | 155 +++++++++++
...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 +++
.../examples/CheckpointExamplesSelfTest.java | 45 +++
.../ContinuationExamplesMultiNodeSelfTest.java | 28 ++
.../examples/ContinuationExamplesSelfTest.java | 33 +++
...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 ++
.../ContinuousMapperExamplesSelfTest.java | 33 +++
.../DeploymentExamplesMultiNodeSelfTest.java | 30 ++
.../examples/DeploymentExamplesSelfTest.java | 33 +++
.../EventsExamplesMultiNodeSelfTest.java | 28 ++
.../ignite/examples/EventsExamplesSelfTest.java | 33 +++
.../GridBasicExamplesMultiNodeSelfTest.java | 28 --
.../examples/GridBasicExamplesSelfTest.java | 82 ------
.../GridCacheExamplesMultiNodeSelfTest.java | 48 ----
.../examples/GridCacheExamplesSelfTest.java | 155 -----------
...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 ---
.../GridCheckpointExamplesSelfTest.java | 45 ---
...idContinuationExamplesMultiNodeSelfTest.java | 28 --
.../GridContinuationExamplesSelfTest.java | 33 ---
...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 --
.../GridContinuousMapperExamplesSelfTest.java | 33 ---
...GridDeploymentExamplesMultiNodeSelfTest.java | 30 --
.../GridDeploymentExamplesSelfTest.java | 33 ---
.../GridEventsExamplesMultiNodeSelfTest.java | 28 --
.../examples/GridEventsExamplesSelfTest.java | 33 ---
...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 ---
.../GridHibernateL2CacheExampleSelfTest.java | 33 ---
.../examples/GridLifecycleExamplesSelfTest.java | 33 ---
...idMemcacheRestExamplesMultiNodeSelfTest.java | 31 ---
.../GridMemcacheRestExamplesSelfTest.java | 41 ---
.../examples/GridMessagingExamplesSelfTest.java | 52 ----
...GridMonteCarloExamplesMultiNodeSelfTest.java | 28 --
.../GridMonteCarloExamplesSelfTest.java | 74 -----
.../examples/GridProjectionExampleSelfTest.java | 39 ---
.../GridSpringBeanExamplesSelfTest.java | 33 ---
.../GridTaskExamplesMultiNodeSelfTest.java | 28 --
.../examples/GridTaskExamplesSelfTest.java | 40 ---
...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 +++
.../HibernateL2CacheExampleSelfTest.java | 33 +++
.../examples/IgniteFsExamplesSelfTest.java | 16 +-
.../examples/LifecycleExamplesSelfTest.java | 33 +++
.../MemcacheRestExamplesMultiNodeSelfTest.java | 31 +++
.../examples/MemcacheRestExamplesSelfTest.java | 41 +++
.../examples/MessagingExamplesSelfTest.java | 52 ++++
.../MonteCarloExamplesMultiNodeSelfTest.java | 28 ++
.../examples/MonteCarloExamplesSelfTest.java | 74 +++++
.../examples/ProjectionExampleSelfTest.java | 39 +++
.../examples/SpringBeanExamplesSelfTest.java | 33 +++
.../examples/TaskExamplesMultiNodeSelfTest.java | 28 ++
.../ignite/examples/TaskExamplesSelfTest.java | 40 +++
.../testsuites/IgniteExamplesSelfTestSuite.java | 54 ++--
.../ScalarExamplesSelfTestSuite.scala | 7 +-
ipc/shmem/configure | 24 +-
ipc/shmem/configure.ac | 2 +-
ipc/shmem/readme.txt | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 4 +-
.../apache/ignite/IgniteCheckedException.java | 24 --
.../java/org/apache/ignite/IgniteException.java | 26 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 9 +-
.../ignite/internal/ClusterGroupAdapter.java | 51 +---
.../ignite/internal/IgniteClusterAsyncImpl.java | 12 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/IgniteCacheProxy.java | 7 +
.../ignite/internal/util/IgniteUtils.java | 22 --
.../apache/ignite/internal/util/typedef/X.java | 36 ---
.../test/config/load/mongo-multinode-foster.xml | 170 ------------
.../IgniteExceptionHelpLinksSelfTest.java | 105 -------
.../GridProjectionForCachesSelfTest.java | 27 +-
.../fs/GridGgfsCommonAbstractTest.java | 4 +-
.../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../IpcSharedMemoryBenchmarkReader.java | 2 +-
.../ignite/p2p/GridP2PUndeploySelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 6 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 6 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 6 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 6 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 6 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 6 +-
.../GridAbstractDiscoverySelfTest.java | 12 +-
.../testframework/junits/GridAbstractTest.java | 10 +-
.../testframework/junits/GridTestIgnite.java | 238 ----------------
.../testframework/junits/GridTestResources.java | 255 -----------------
.../ignite/testframework/junits/IgniteMock.java | 238 ++++++++++++++++
.../junits/IgniteTestResources.java | 255 +++++++++++++++++
.../junits/spi/GridSpiAbstractTest.java | 6 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 -
...idHadoopDefaultMapReducePlannerSelfTest.java | 6 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 14 +-
.../tests/ScalarAffinityRoutingSpec.scala | 12 +-
.../tests/ScalarCacheProjectionSpec.scala | 2 +-
.../ignite/scalar/tests/ScalarCacheSpec.scala | 2 +-
.../scalar/tests/ScalarProjectionSpec.scala | 36 +--
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
205 files changed, 3432 insertions(+), 3913 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/docs/core-site.ignite.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --cc examples/config/example-cache.xml
index 0c3557d,23a0a8d..6e6731f
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@@ -15,16 -15,16 +15,16 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid cache.
+ Ignite Spring configuration file to startup ignite cache.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
- When starting GridGain from Java IDE, pass path to this file to GridGain:
- GridGain.start("examples/config/example-cache.xml");
+ When starting Ignite from Java IDE, pass path to this file to Ignition:
+ Ignition.start("examples/config/example-cache.xml");
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --cc examples/config/example-compute.xml
index a0db810,33400a1..50e85ff
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- Grid configuration with all defaults and enabled p2p deployment and
enabled events.
+ Ignite configuration with all defaults and enabled p2p deployment and
enabled events.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --cc examples/config/example-streamer.xml
index e0b9c0c,b2b8aec..ad7a6d0
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@@ -15,12 -15,12 +15,12 @@@
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.
- -->
+-->
<!--
- GridGain Spring configuration file to startup grid with streamers.
+ Ignite Spring configuration file to startup ignite with streamers.
- When starting a standalone GridGain node, you need to execute the
following command:
+ When starting a standalone node, you need to execute the following
command:
{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-streamer.xml
When starting nodes this way JAR file containing the examples code
should be placed to {IGNITE_HOME}/libs folder. You can build
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/filesystem/core-site.xml
----------------------------------------------------------------------
diff --cc examples/config/filesystem/core-site.xml
index 635aeb0,a422077..17a7c13
--- a/examples/config/filesystem/core-site.xml
+++ b/examples/config/filesystem/core-site.xml
@@@ -16,10 -16,10 +16,10 @@@
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.
- -->
+-->
<!--
- Example configuration of the Hadoop FS driver over GridGain FS API.
+ Example configuration of the Hadoop FS driver over Ignite FS API.
Copy this file into '$HADOOP_HOME/conf/core-site.xml'.
-->
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/filesystem/example-ignitefs.xml
----------------------------------------------------------------------
diff --cc examples/config/filesystem/example-ignitefs.xml
index 0000000,0cdb774..e0bc833
mode 000000,100644..100644
--- a/examples/config/filesystem/example-ignitefs.xml
+++ b/examples/config/filesystem/example-ignitefs.xml
@@@ -1,0 -1,165 +1,165 @@@
+ <?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 ignite cache.
+
+ When starting a standalone node, you need to execute the following
command:
+ {IGNITE_HOME}/bin/ignite.{bat|sh}
examples/config/filesystem/example-ignitefs.xml
+
+ When starting Ignite from Java IDE, pass path to this file into Ignition:
+ Ignition.start("examples/config/filesystem/example-ignitefs.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";>
+
+ <!--
+ Optional description.
+ -->
+ <description>
+ Spring file for ignite configuration with client available endpoints.
+ </description>
+
+ <!--
+ Initialize property configurer so we can reference environment
variables.
+ -->
+ <bean id="propertyConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName"
value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+ <property name="searchSystemEnvironment" value="true"/>
+ </bean>
+
+ <!--
+ Configuration below demonstrates how to setup a IgniteFs node with
file data.
+ -->
+ <bean id="ignite.cfg"
class="org.apache.ignite.configuration.IgniteConfiguration">
+ <!-- Set to true to enable cluster-aware class loading for examples,
default is false. -->
+ <property name="peerClassLoadingEnabled" value="true"/>
+
+ <property name="marshaller">
+ <bean
class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+ <!-- Set to false to allow non-serializable objects in
examples, default is true. -->
+ <property name="requireSerializable" value="false"/>
+ </bean>
+ </property>
+
+ <property name="ggfsConfiguration">
+ <list>
+ <bean class="org.apache.ignite.fs.IgniteFsConfiguration">
+ <property name="name" value="ignitefs"/>
+ <property name="metaCacheName" value="ignitefs-meta"/>
+ <property name="dataCacheName" value="ignitefs-data"/>
+
+ <!-- Must correlate with cache affinity mapper. -->
+ <property name="blockSize" value="#{128 * 1024}"/>
+ <property name="perNodeBatchSize" value="512"/>
+ <property name="perNodeParallelBatchCount" value="16"/>
+
+ <!-- Set number of prefetch blocks. -->
+ <property name="prefetchBlocks" value="32"/>
+
+ <!--
+ This will disable IPC endpoint binding thus
preventing Hadoop clients from connecting to IgniteFs.
+ With this option set to false the only possible way
to interact with IgniteFs is through
+ Ignite API.
+ -->
+ <property name="ipcEndpointEnabled" value="false"/>
+
+ <!--
+ Example of configured IPC loopback endpoint.
+ -->
+ <!--
+ <property name="ipcEndpointConfiguration">
+ <map>
+ <entry key="type" value="tcp"/>
+ </map>
+ </property>
+ -->
+
+ <!--
+ Example of configured shared memory endpoint.
+ -->
+ <!--
+ <property name="ipcEndpointConfiguration">
+ <map>
+ <entry key="type" value="shmem"/>
+ <entry key="port" value="10500"/>
+ </map>
+ </property>
+ -->
+ </bean>
+ </list>
+ </property>
+
+ <property name="cacheConfiguration">
+ <list>
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
+ <property name="name" value="ignitefs-data"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="queryIndexEnabled" value="false"/>
+ <property name="writeSynchronizationMode"
value="FULL_SYNC"/>
+ <property name="distributionMode"
value="PARTITIONED_ONLY"/>
+ <property name="backups" value="0"/>
+ <property name="affinityMapper">
+ <bean
class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper">
+ <!-- Haw many blocks in row will be stored on the
same node. -->
+ <constructor-arg value="512"/>
+ </bean>
+ </property>
+ </bean>
+
+ <bean class="org.apache.ignite.cache.CacheConfiguration">
+ <property name="name" value="ignitefs-meta"/>
+ <property name="cacheMode" value="REPLICATED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="queryIndexEnabled" value="false"/>
+ <property name="writeSynchronizationMode"
value="FULL_SYNC"/>
+ </bean>
+ </list>
+ </property>
+
+ <!-- Explicitly configure TCP discovery SPI to provide list of
initial nodes. -->
+ <property name="discoverySpi">
+ <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+ <property name="ipFinder">
+ <!--
+ Ignition provides several options for automatic
discovery that can be used
+ instead os static IP based discovery. For information
on all options refer
+ to our documentation:
http://doc.gridgain.org/latest/Automatic+Node+Discovery
+ -->
+ <!-- Uncomment static IP finder to enable static-based
discovery of initial nodes. -->
+ <!--<bean
class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->
+ <bean
class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+ <property name="addresses">
+ <list>
+ <!-- In distributed environment, replace with
actual host IP address. -->
+ <value>127.0.0.1:47500..47509</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ </beans>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/hibernate/example-hibernate-L2-cache.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/config/servlet/WEB-INF/web.xml
----------------------------------------------------------------------
diff --cc examples/config/servlet/WEB-INF/web.xml
index 56597ff,f48921e..239da04
--- a/examples/config/servlet/WEB-INF/web.xml
+++ b/examples/config/servlet/WEB-INF/web.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- Example web.xml to startup GridGain from Servlet container, like Tomcat.
+ Example web.xml to startup Ignite from Servlet container, like Tomcat.
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/compute/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/datagrid/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/hibernate.cfg.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/fs/package.html
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/fs/package.html
index 0000000,80941e2..2414651
mode 000000,100644..100644
--- a/examples/src/main/java/org/apache/ignite/examples/fs/package.html
+++ b/examples/src/main/java/org/apache/ignite/examples/fs/package.html
@@@ -1,0 -1,23 +1,24 @@@
+ <!--
+ 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.
- -->
++-->
++
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+ <html>
+ <body>
+ <!-- Package description. -->
+ Demonstrates using of Ignite File System.
+ </body>
+ </html>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/misc/springbean/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
----------------------------------------------------------------------
diff --cc
examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
index 4cc74e5,83099ce..7efea4e
---
a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
+++
b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
@@@ -15,10 -15,10 +15,10 @@@
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.
- -->
+-->
<!--
- Command line (default) grid configuration.
+ Command line (default) ignite configuration.
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/examples/src/main/java/org/apache/ignite/examples/package.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/507066f6/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 0000000,83c96ae..fccc83f
mode 000000,100644..100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@@ -1,0 -1,230 +1,238 @@@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
++/*
++ * 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.
+ */
+
+ package org.apache.ignite.testframework.junits;
+
+ import org.apache.ignite.*;
+ import org.apache.ignite.cache.*;
+ import org.apache.ignite.cache.affinity.*;
+ import org.apache.ignite.cluster.*;
+ import org.apache.ignite.configuration.*;
+ import org.apache.ignite.hadoop.*;
+ import org.apache.ignite.internal.product.*;
+ import org.apache.ignite.marshaller.*;
+ import org.apache.ignite.plugin.*;
+ import org.apache.ignite.plugin.security.*;
+ import org.jetbrains.annotations.*;
+
+ import javax.management.*;
+ import java.util.*;
+ import java.util.concurrent.*;
+
+ /**
+ * Ignite mock.
+ */
+ public class IgniteMock implements Ignite {
+ /** Ignite name */
+ private final String name;
+
+ /** Local host. */
+ private final String locHost;
+
+ /** */
+ private final UUID nodeId;
+
+ /** */
+ private IgniteMarshaller marshaller;
+
+ /** */
+ private final MBeanServer jmx;
+
+ /** */
+ private final String home;
+
+ /**
+ * Mock values
+ *
+ * @param name Name.
+ * @param locHost Local host.
+ * @param nodeId Node ID.
+ * @param marshaller Marshaller.
+ * @param jmx Jmx Bean Server.
+ * @param home Ignite home.
+ */
+ public IgniteMock(
+ String name, String locHost, UUID nodeId, IgniteMarshaller
marshaller, MBeanServer jmx, String home) {
+ this.locHost = locHost;
+ this.nodeId = nodeId;
+ this.marshaller = marshaller;
+ this.jmx = jmx;
+ this.home = home;
+ this.name = name;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String name() {
+ return name;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteLogger log() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteConfiguration configuration() {
+ IgniteConfiguration cfg = new IgniteConfiguration();
+
+ cfg.setMarshaller(marshaller);
+ cfg.setNodeId(nodeId);
+ cfg.setMBeanServer(jmx);
+ cfg.setGridGainHome(home);
+ cfg.setLocalHost(locHost);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteCluster cluster() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteCompute compute() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteCompute compute(ClusterGroup prj) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteMessaging message() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteMessaging message(ClusterGroup prj) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteEvents events() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteEvents events(ClusterGroup prj) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteManaged managed() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteManaged managed(ClusterGroup prj) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public ExecutorService executorService() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public ExecutorService executorService(ClusterGroup prj) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteProduct product() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteScheduler scheduler() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public GridSecurity security() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgnitePortables portables() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> GridCache<K, V> cache(@Nullable String name) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Collection<GridCache<?, ?>> caches() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> IgniteCache<K, V> jcache(@Nullable String name) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteTransactions transactions() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K, V> IgniteDataLoader<K, V> dataLoader(@Nullable
String cacheName) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteFs fileSystem(String name) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Collection<IgniteFs> fileSystems() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public GridHadoop hadoop() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteStreamer streamer(@Nullable String name) {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public Collection<IgniteStreamer> streamers() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <T extends IgnitePlugin> T plugin(String name) throws
PluginNotFoundException {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() {}
+
+ /** {@inheritDoc} */
+ @Override public <K> CacheAffinity<K> affinity(String cacheName) {
+ return null;
+ }
+ }
