Update spring 2.11
diff --git a/docs/2.11.0/extensions-and-integrations/spring/spring-caching.html b/docs/2.11.0/extensions-and-integrations/spring/spring-caching.html
index eadc719..9758e2e 100644
--- a/docs/2.11.0/extensions-and-integrations/spring/spring-caching.html
+++ b/docs/2.11.0/extensions-and-integrations/spring/spring-caching.html
@@ -3307,23 +3307,162 @@
<h2 id="overview">Overview</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>Ignite is shipped with <code>SpringCacheManager</code> - an implementation of <a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html" target="_blank" rel="noopener">Spring Cache Abstraction</a>.
-It provides an annotation-based way to enable caching for Java methods so that the result of a method execution is stored
-in an Ignite cache. Later, if the same method is called with the same set of parameter values, the result will be retrieved
-from the cache instead of actually executing the method.</p>
+<p><a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html" target="_blank" rel="noopener">Spring Cache</a>
+abstraction provides an annotation-based way to enable caching for Java methods so that the result of a method execution
+is stored in an external cache storage. Later, if the same method is called with the same set of parameter values, the result
+will be retrieved from the cache instead of actually executing the method.</p>
+</div>
+<div class="paragraph">
+<p>Apache Ignite provides the <code>ignite-spring-cache-ext</code> extension that allows to use Apache Ignite Cache as an external
+storage for the Spring Cache abstraction. The mentioned above integration is achieved by providing implementations of the
+<code>CacheManager</code> Spring interface. There are two such implementations: <code>SpringCacheManager</code> and
+<code>IgniteClientSpringCacheManager</code>, which use either Apache Ignite node or Apache Ignite thin client to connect to the
+Apache Ignite cluster and perform data caching.</p>
</div>
</div>
</div>
<div class="sect1">
-<h2 id="enabling-ignite-for-spring-caching">Enabling Ignite for Spring Caching</h2>
+<h2 id="maven-configuration">Maven Configuration</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>Only two simple steps are required to plug in an Ignite cache into your Spring-based application:</p>
+<p>If you use Maven to manage dependencies in your project, you can add Apache Ignite Spring Cache extension
+dependencies to the application’s <code>pom.xml</code> file like this:</p>
+</div>
+<code-tabs><code-tab data-tab=' For all Apache Ignite versions since 2.12.0'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-spring-cache-ext<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite-spring-cache-ext.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-core<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-spring<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+ <span class="nt"><exclusions></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"></exclusions></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${spring.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='For Apache Ignite 2.11.0'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-spring-cache-ext<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite-spring-cache-ext.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-core<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-spring<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+ <span class="nt"><exclusions></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-core<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-aop<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-expressions<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-beans<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-jdbc<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-tx<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"></exclusions></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${spring.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span></code></pre>
+</div>
+</div></code-tab></code-tabs>
+<div class="paragraph">
+<p>Replace <code>${ignite-spring-cache-ext.version}</code>, <code>${spring.version}</code>, and
+<code>${ignite.version}</code> with an actual version of Apache Ignite Spring Cache extension, Spring, and
+Apache Ignite dependency you need, respectively.</p>
+</div>
+<div class="paragraph">
+<p>The table below shows available versions of the Apache Ignite Spring Cache extension and compatible versions
+of the Apache Ignite and Spring.</p>
+</div>
+<table class="tableblock frame-all grid-all stripes-even stretch">
+<colgroup>
+<col style="width: 28.5714%;">
+<col style="width: 35.7142%;">
+<col style="width: 35.7144%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Apache Ignite Spring Cache extension version</th>
+<th class="tableblock halign-left valign-top">Apache Ignite versions</th>
+<th class="tableblock halign-left valign-top">Spring versions</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">1.0.0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">All versions since 2.11.0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">All versions since 4.3.0</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="sect1">
+<h2 id="apache-ignite-node-cache-manager-configuration">Apache Ignite Node Cache Manager Configuration</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="cluster-connection-configuration">Cluster Connection Configuration</h3>
+<div class="paragraph">
+<p>To plug in an Ignite cache into your Spring-based application that uses Ignite node to connect to Apache Ignite cluster
+you need to perform just two simple steps:</p>
</div>
<div class="ulist">
<ul>
<li>
-<p>Start an Ignite node with proper configuration in embedded mode (i.e., in the same JVM where the application is running). It can already have predefined caches, but it’s not required - caches will be created automatically on first access if needed.</p>
+<p>Start an Ignite node with proper configuration in embedded mode (i.e., in the same JVM where the application is running).
+It can already have predefined caches, but it’s not required - caches will be created automatically on first access if required.</p>
</li>
<li>
<p>Configure <code>SpringCacheManager</code> as the cache manager in the Spring application context.</p>
@@ -3332,10 +3471,68 @@
</div>
<div class="paragraph">
<p>The embedded node can be started by <code>SpringCacheManager</code> itself. In this case you will need to provide a path to either
-the Ignite configuration XML file or <code>IgniteConfiguration</code> bean via <code>configurationPath</code> or <code>configuration</code>
+the Ignite configuration XML file or <code>IgniteConfiguration</code> instance via <code>configurationPath</code> or <code>configuration</code>
properties respectively (see examples below). Note that setting both is illegal and results in <code>IllegalArgumentException</code>.</p>
</div>
-<code-tabs><code-tab data-tab='configuration path'><div class="listingblock">
+<h3 id="specifying-apache-ignite-node-configuration" class="discrete">Specifying Apache Ignite Node Configuration</h3>
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">SpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">SpringCacheManager</span> <span class="n">mgr</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">SpringCacheManager</span><span class="o">();</span>
+
+ <span class="n">mgr</span><span class="o">.</span><span class="na">setConfiguration</span><span class="o">(</span><span class="k">new</span> <span class="nc">IgniteConfiguration</span><span class="o">()</span>
+ <span class="o">.</span><span class="na">setIgniteInstanceName</span><span class="o">(</span><span class="s">"<name of the Ignite node instance>"</span><span class="o">));</span>
+ <span class="c1">// Other required configuration parameters.</span>
+
+ <span class="k">return</span> <span class="n">mgr</span><span class="o">;</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
+ <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
+ <span class="na">xmlns:cache=</span><span class="s">"http://www.springframework.org/schema/cache"</span>
+ <span class="na">xsi:schemaLocation=</span><span class="s">"
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/cache
+ http://www.springframework.org/schema/cache/spring-cache.xsd"</span><span class="nt">></span>
+ <span class="c"><!-- Provide configuration bean. --></span>
+ <span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.SpringCacheManager"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"configuration"</span><span class="nt">></span>
+ <span class="nt"><bean</span> <span class="na">class=</span><span class="s">"org.apache.ignite.configuration.IgniteConfiguration"</span><span class="nt">></span>
+ ...
+ <span class="nt"></bean></span>
+ <span class="nt"></property></span>
+ <span class="nt"></bean></span>
+
+ <span class="c"><!-- Enable annotation-driven caching. --></span>
+ <span class="nt"><cache:annotation-driven/></span>
+<span class="nt"></beans></span></code></pre>
+</div>
+</div></code-tab></code-tabs>
+<h3 id="specifying-path-to-apache-ignite-xml-node-configuration-file" class="discrete">Specifying Path to Apache Ignite XML Node Configuration File</h3>
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">SpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">SpringCacheManager</span> <span class="n">mgr</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">SpringCacheManager</span><span class="o">();</span>
+
+ <span class="n">mgr</span><span class="o">.</span><span class="na">setConfigurationPath</span><span class="o">(</span><span class="s">"<path to an Apache Ignite configuration XML file (path can be absolute or relative to `IGNITE_HOME`)"</span><span class="o">);</span>
+
+ <span class="k">return</span> <span class="n">mgr</span><span class="o">;</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
<div class="content">
<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
<span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
@@ -3347,44 +3544,37 @@
http://www.springframework.org/schema/cache/spring-cache.xsd"</span><span class="nt">></span>
<span class="c"><!-- Provide configuration file path. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.SpringCacheManager"</span><span class="nt">></span>
- <span class="nt"><property</span> <span class="na">name=</span><span class="s">"configurationPath"</span> <span class="na">value=</span><span class="s">"examples/config/spring-cache.xml"</span><span class="nt">/></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"configurationPath"</span> <span class="na">value=</span><span class="s">"<path to an Apache Ignite configuration XML file (path can be absolute or relative to `IGNITE_HOME`)"</span><span class="nt">/></span>
<span class="nt"></bean></span>
<span class="c"><!-- Enable annotation-driven caching. --></span>
<span class="nt"><cache:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
-</div></code-tab><code-tab data-tab='configuration bean'><div class="listingblock">
-<div class="content">
-<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
- <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
- <span class="na">xmlns:cache=</span><span class="s">"http://www.springframework.org/schema/cache"</span>
- <span class="na">xsi:schemaLocation=</span><span class="s">"
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/cache
- http://www.springframework.org/schema/cache/spring-cache.xsd"</span><span class="nt">></span>
- <span class="err"><</span>-- Provide configuration bean. -->
- <span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.SpringCacheManager"</span><span class="nt">></span>
- <span class="nt"><property</span> <span class="na">name=</span><span class="s">"configuration"</span><span class="nt">></span>
- <span class="nt"><bean</span> <span class="na">class=</span><span class="s">"org.apache.ignite.configuration.IgniteConfiguration"</span><span class="nt">></span>
- ...
- <span class="nt"></bean></span>
- <span class="nt"></property></span>
- <span class="nt"></bean></span>
-
- <span class="err"><</span>-- Enable annotation-driven caching. -->
- <span class="nt"><cache:annotation-driven/></span>
-<span class="nt"></beans></span></code></pre>
-</div>
</div></code-tab></code-tabs>
+<h3 id="specifying-name-of-the-manually-started-apache-ignite-node-instance" class="discrete">Specifying Name of the Manually Started Apache Ignite Node Instance</h3>
<div class="paragraph">
<p>It’s possible that you already have an Ignite node running when the cache manager is initialized (e.g., it was started using
-<code>ServletContextListenerStartup</code>). In this case you should simply provide the grid name via <code>gridName</code> property.
+<code>ServletContextListenerStartup</code>). In this case you should simply provide the grid name via <code>igniteInstanceName</code> property.
Note that if you don’t set the grid name as well, the cache manager will try to use the default Ignite instance
(the one with the <code>null</code> name). Here is an example:</p>
</div>
-<code-tabs><code-tab data-tab='Using an already started Ignite instance'><div class="listingblock">
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">SpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">SpringCacheManager</span> <span class="n">mgr</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">SpringCacheManager</span><span class="o">();</span>
+
+ <span class="n">mgr</span><span class="o">.</span><span class="na">setIgniteInstanceName</span><span class="o">(</span><span class="s">"<name of the Apache Ignite node instance>"</span><span class="o">);</span>
+
+ <span class="k">return</span> <span class="n">mgr</span><span class="o">;</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
<div class="content">
<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
<span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
@@ -3396,7 +3586,7 @@
http://www.springframework.org/schema/cache/spring-cache.xsd"</span><span class="nt">></span>
<span class="c"><!-- Provide grid name. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.SpringCacheManager"</span><span class="nt">></span>
- <span class="nt"><property</span> <span class="na">name=</span><span class="s">"gridName"</span> <span class="na">value=</span><span class="s">"myGrid"</span><span class="nt">/></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"igniteInstanceName"</span> <span class="na">value=</span><span class="s">"<name of the Apache Ignite node instance>"</span><span class="nt">/></span>
<span class="nt"></bean></span>
<span class="c"><!-- Enable annotation-driven caching. --></span>
@@ -3420,26 +3610,42 @@
</table>
</div>
</div>
-</div>
-<div class="sect1">
-<h2 id="dynamic-caches">Dynamic Caches</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="dynamic-caches">Dynamic Caches</h3>
<div class="paragraph">
<p>While you can have all required caches predefined in Ignite configuration, it’s not required. If Spring wants to use a
cache that doesn’t exist, the <code>SpringCacheManager</code> will automatically create it.</p>
</div>
<div class="paragraph">
-<p>If otherwise not specified, a new cache will be created will all defaults. To customize it, you can provide a configuration
+<p>If otherwise not specified, a new cache will be created with default configuration. To customize it, you can provide a configuration
template via <code>dynamicCacheConfiguration</code> property. For example, if you want to use <code>REPLICATED</code> caches instead of
<code>PARTITIONED</code>, you should configure <code>SpringCacheManager</code> like this:</p>
</div>
-<code-tabs><code-tab data-tab='Dynamic cache configuration'><div class="listingblock">
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">SpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">SpringCacheManager</span> <span class="n">mgr</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">SpringCacheManager</span><span class="o">();</span>
+ <span class="o">...</span>
+
+ <span class="n">mgr</span><span class="o">.</span><span class="na">setDynamicCacheConfiguration</span><span class="o">(</span><span class="k">new</span> <span class="nc">CacheConfiguration</span><span class="o"><>(</span><span class="s">"<cache name>"</span><span class="o">)</span>
+ <span class="o">.</span><span class="na">setCacheMode</span><span class="o">(</span><span class="nc">CacheMode</span><span class="o">.</span><span class="na">REPLICATED</span><span class="o">));</span>
+
+ <span class="k">return</span> <span class="n">mgr</span><span class="o">;</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
<div class="content">
<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.SpringCacheManager"</span><span class="nt">></span>
...
<span class="nt"><property</span> <span class="na">name=</span><span class="s">"dynamicCacheConfiguration"</span><span class="nt">></span>
<span class="nt"><bean</span> <span class="na">class=</span><span class="s">"org.apache.ignite.configuration.CacheConfiguration"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"name"</span> <span class="na">value=</span><span class="s">"<cache name>"</span><span class="nt">/></span>
<span class="nt"><property</span> <span class="na">name=</span><span class="s">"cacheMode"</span> <span class="na">value=</span><span class="s">"REPLICATED"</span><span class="nt">/></span>
<span class="nt"></bean></span>
<span class="nt"></property></span>
@@ -3450,7 +3656,23 @@
<p>You can also utilize near caches on client side. To achieve this, simply provide near cache configuration via the
<code>dynamicNearCacheConfiguration</code> property. By default, near cache is not created. Here is an example:</p>
</div>
-<code-tabs><code-tab data-tab='Dynamic near cache configuration'><div class="listingblock">
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">SpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">()</span> <span class="o">{</span>
+ <span class="nc">SpringCacheManager</span> <span class="n">mgr</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">SpringCacheManager</span><span class="o">();</span>
+ <span class="o">...</span>
+
+ <span class="n">mgr</span><span class="o">.</span><span class="na">setDynamicNearCacheConfiguration</span><span class="o">(</span><span class="k">new</span> <span class="nc">NearCacheConfiguration</span><span class="o"><>().</span><span class="na">setNearStartSize</span><span class="o">(</span><span class="mi">1000</span><span class="o">));</span>
+
+ <span class="k">return</span> <span class="n">mgr</span><span class="o">;</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
<div class="content">
<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.SpringCacheManager"</span><span class="nt">></span>
...
@@ -3465,6 +3687,164 @@
</div></code-tab></code-tabs>
</div>
</div>
+</div>
+<div class="sect1">
+<h2 id="apache-ignite-thin-client-cache-manager-configuration">Apache Ignite Thin Client Cache Manager Configuration</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>This chapter shows how to set up <code>IgniteClientSpringCacheManager</code> that relies on Ignite thin client to connect
+to the Ignite cluster and perform caching.</p>
+</div>
+<div class="admonitionblock important">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Important</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p><code>IgniteClientSpringCacheManager</code> does not support Spring Cache synchronous mode
+(<a href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/cache/annotation/Cacheable.html#sync--" target="_blank" rel="noopener">Cacheable#sync</a>).
+If this feature is crucial to your application, choose the
+<a href="/docs/latest/extensions-and-integrations/spring/spring-caching#apache-ignite-node-cache-manager-configuration">SpringCacheManager</a>
+that uses an Ignite node to connect to Ignite cluster.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="sect2">
+<h3 id="cluster-connection-configuration-2">Cluster Connection Configuration</h3>
+<div class="paragraph">
+<p>Cluster connection configuration defines Apache Ignite thin client used by <code>IgniteClientSpringCacheManager</code> to access
+the cluster.
+There are several approaches to do this:</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>It is incorrect to mix multiple approaches - this results in the <code>IllegalArgumentException</code> exception during the manager startup.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<h3 id="specifying-instance-of-the-apache-ignite-thin-client" class="discrete">Specifying Instance of the Apache Ignite Thin Client</h3>
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">IgniteClient</span> <span class="nf">igniteClient</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="nc">Ignition</span><span class="o">.</span><span class="na">startClient</span><span class="o">(</span><span class="k">new</span> <span class="nc">ClientConfiguration</span><span class="o">().</span><span class="na">setAddresses</span><span class="o">(</span><span class="s">"127.0.0.1:10800"</span><span class="o">));</span>
+ <span class="o">}</span>
+
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">IgniteClientSpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">(</span><span class="nc">IgniteClient</span> <span class="n">cli</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">IgniteClientSpringCacheManager</span><span class="o">().</span><span class="na">setClientInstance</span><span class="o">(</span><span class="n">cli</span><span class="o">);</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
+ <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
+ <span class="na">xmlns:cache=</span><span class="s">"http://www.springframework.org/schema/cache"</span>
+ <span class="na">xsi:schemaLocation=</span><span class="s">"
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/cache
+ http://www.springframework.org/schema/cache/spring-cache.xsd"</span><span class="nt">></span>
+ <span class="c"><!--
+ Note that org.apache.ignite.IgniteClientSpringBean is available since Apache Ignite 2.11.0 version.
+ For Apache Ignite 2.10.0 and earlier `org.apache.ignite.client.IgniteClient` bean should be created
+ manually with concern of its connection to the Ignite cluster.
+ --></span>
+ <span class="nt"><bean</span> <span class="na">id=</span><span class="s">"igniteClient"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.IgniteClientSpringBean"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"clientConfiguration"</span><span class="nt">></span>
+ <span class="nt"><bean</span> <span class="na">class=</span><span class="s">"org.apache.ignite.configuration.ClientConfiguration"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"addresses"</span><span class="nt">></span>
+ <span class="nt"><list></span>
+ <span class="nt"><value></span>127.0.0.1:10800<span class="nt"></value></span>
+ <span class="nt"></list></span>
+ <span class="nt"></property></span>
+ <span class="nt"></bean></span>
+ <span class="nt"></property></span>
+ <span class="nt"></bean></span>
+
+ <span class="c"><!-- Provide Apache Ignite thin client instance. --></span>
+ <span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.IgniteClientSpringCacheManager"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"clientInstance"</span> <span class="na">ref=</span><span class="s">"igniteClient"</span><span class="nt">/></span>
+ <span class="nt"></bean></span>
+
+ <span class="c"><!-- Use annotation-driven cache configuration. --></span>
+ <span class="nt"><cache:annotation-driven/></span>
+<span class="nt"></beans></span></code></pre>
+</div>
+</div></code-tab></code-tabs>
+<h3 id="specifying-apache-ignite-thin-client-configuration" class="discrete">Specifying Apache Ignite Thin Client Configuration</h3>
+<div class="paragraph">
+<p>In this case, Apache Ignite thin client instance is started automatically by the <code>IgniteClientSpringCacheManager</code> based
+on the provided configuration.</p>
+</div>
+<code-tabs><code-tab data-tab='Java'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="java"><span class="nd">@Configuration</span>
+<span class="nd">@EnableCaching</span>
+<span class="kd">public</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
+ <span class="nd">@Bean</span>
+ <span class="kd">public</span> <span class="nc">IgniteClientSpringCacheManager</span> <span class="nf">cacheManager</span><span class="o">()</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="k">new</span> <span class="nf">IgniteClientSpringCacheManager</span><span class="o">()</span>
+ <span class="o">.</span><span class="na">setClientConfiguration</span><span class="o">(</span><span class="k">new</span> <span class="nc">ClientConfiguration</span><span class="o">()</span>
+ <span class="o">.</span><span class="na">setAddresses</span><span class="o">(</span><span class="s">"127.0.0.1:10800"</span><span class="o">));</span>
+ <span class="o">}</span>
+<span class="o">}</span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab='XML'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><beans</span> <span class="na">xmlns=</span><span class="s">"http://www.springframework.org/schema/beans"</span>
+ <span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span>
+ <span class="na">xmlns:cache=</span><span class="s">"http://www.springframework.org/schema/cache"</span>
+ <span class="na">xsi:schemaLocation=</span><span class="s">"
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/cache
+ http://www.springframework.org/schema/cache/spring-cache.xsd"</span><span class="nt">></span>
+ <span class="c"><!-- Provide configuration bean. --></span>
+ <span class="nt"><bean</span> <span class="na">id=</span><span class="s">"cacheManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.cache.spring.IgniteClientSpringCacheManager"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"clientConfiguration"</span><span class="nt">></span>
+ <span class="nt"><bean</span> <span class="na">class=</span><span class="s">"org.apache.ignite.configuration.ClientConfiguration"</span><span class="nt">></span>
+ <span class="nt"><property</span> <span class="na">name=</span><span class="s">"addresses"</span><span class="nt">></span>
+ <span class="nt"><list></span>
+ <span class="nt"><value></span>127.0.0.1:10800<span class="nt"></value></span>
+ <span class="nt"></list></span>
+ <span class="nt"></property></span>
+ <span class="nt"></bean></span>
+ <span class="nt"></property></span>
+ <span class="nt"></bean></span>
+
+ <span class="c"><!-- Use annotation-driven cache configuration. --></span>
+ <span class="nt"><cache:annotation-driven/></span>
+<span class="nt"></beans></span></code></pre>
+</div>
+</div></code-tab></code-tabs>
+</div>
+<div class="sect2">
+<h3 id="dynamic-caches-2">Dynamic Caches</h3>
+<div class="paragraph">
+<p>Dynamic Caches configuration for <code>IgniteClientSpringCacheManager</code> is performed the same way as for
+<a href="/docs/latest/extensions-and-integrations/spring/spring-caching#dynamic-caches">SpringCacheManager</a>
+that uses Apache Ignite node instance to access the cluster.</p>
+</div>
+</div>
+</div>
+</div>
<div class="sect1">
<h2 id="example">Example</h2>
<div class="sectionbody">
@@ -3553,8 +3933,19 @@
<div class="toc-wrapper">
<ul class="sectlevel1">
<li><a href="#overview">Overview</a></li>
-<li><a href="#enabling-ignite-for-spring-caching">Enabling Ignite for Spring Caching</a></li>
+<li><a href="#maven-configuration">Maven Configuration</a></li>
+<li><a href="#apache-ignite-node-cache-manager-configuration">Apache Ignite Node Cache Manager Configuration</a>
+<ul class="sectlevel2">
+<li><a href="#cluster-connection-configuration">Cluster Connection Configuration</a></li>
<li><a href="#dynamic-caches">Dynamic Caches</a></li>
+</ul>
+</li>
+<li><a href="#apache-ignite-thin-client-cache-manager-configuration">Apache Ignite Thin Client Cache Manager Configuration</a>
+<ul class="sectlevel2">
+<li><a href="#cluster-connection-configuration-2">Cluster Connection Configuration</a></li>
+<li><a href="#dynamic-caches-2">Dynamic Caches</a></li>
+</ul>
+</li>
<li><a href="#example">Example</a></li>
</ul>
</div>
@@ -3595,11 +3986,11 @@
debug: false,
});
</script>
-<script type='module' src='/assets/js/index.js?1634150558' async crossorigin></script>
-<script type='module' src='/assets/js/versioning.js?1634150558' async crossorigin></script>
+<script type='module' src='/assets/js/index.js?1636554015' async crossorigin></script>
+<script type='module' src='/assets/js/versioning.js?1636554015' async crossorigin></script>
-<link rel="stylesheet" href="/assets/css/styles.css?1634150558" media="print" onload="this.media='all'">
-<noscript><link media="all" rel="stylesheet" href="/assets/css/styles.css?1634150558"></noscript>
+<link rel="stylesheet" href="/assets/css/styles.css?1636554015" media="print" onload="this.media='all'">
+<noscript><link media="all" rel="stylesheet" href="/assets/css/styles.css?1636554015"></noscript>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" media="print" onload="this.media='all'">
<noscript><link media="all" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"></noscript>
diff --git a/docs/2.11.0/extensions-and-integrations/spring/spring-tx.html b/docs/2.11.0/extensions-and-integrations/spring/spring-tx.html
index 2838faa..ddb56d2 100644
--- a/docs/2.11.0/extensions-and-integrations/spring/spring-tx.html
+++ b/docs/2.11.0/extensions-and-integrations/spring/spring-tx.html
@@ -3314,10 +3314,10 @@
<div class="paragraph">
<p>Apache Ignite provides the <code>ignite-spring-tx-ext</code> extension that allows to manage
<a href="https://ignite.apache.org/docs/latest/key-value-api/transactions#performing-transactions" target="_blank" rel="noopener">Apache Ignite Transactions</a>
-through the Spring Transactions abstraction. The mentioned integration is achieved by providing implementations of the
+through the Spring Transactions abstraction. The mentioned above integration is achieved by providing implementations of the
<code>TransactionManager</code> Spring Transactions interface. There are two such implementations: <code>SpringTransactionManager</code> and
-<code>IgniteClientSpringTransactionManager</code>, which use Apache Ignite node or Apache Ignite thin client to connect to the
-Apache Ignite cluster and manage the Apache Ignite transactions, respectively.</p>
+<code>IgniteClientSpringTransactionManager</code>, which use either Apache Ignite node or Apache Ignite thin client to connect to the
+Apache Ignite cluster and manage the Apache Ignite transactions.</p>
</div>
<div class="paragraph">
<p>To enable declarative transaction management in your Spring application, create and configure
@@ -3330,27 +3330,10 @@
<h2 id="maven-configuration">Maven Configuration</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>If you are using Maven to manage dependencies in your project, you can add Spring Transactions extension dependencies to
+<p>If you use Maven to manage dependencies in your project, you can add Spring Transactions extension dependencies to
the application’s <code>pom.xml</code> file like this:</p>
</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>For Apache Ignite versions earlier than <code>2.11.0</code>, the <code>ignite-spring-tx-ext</code> dependency must be added to
-classpath before <code>ignite-spring</code>, due to duplication of Spring Transactions integration classes. If you are using Maven
-to manage dependencies, place <code>ignite-spring-tx-ext</code> before the <code>ignite-spring</code> dependency in the
-application’s <code>pom.xml</code> file.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<code-tabs><code-tab data-tab='pom.xml'><div class="listingblock">
+<code-tabs><code-tab data-tab='For all Apache Ignite versions since 2.12.0'><div class="listingblock">
<div class="content">
<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
@@ -3360,8 +3343,40 @@
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-core<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>ignite-spring<span class="nt"></artifactId></span>
<span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+ <span class="nt"><exclusions></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"></exclusions></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${spring.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-tx<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${spring.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span></code></pre>
+</div>
+</div></code-tab><code-tab data-tab=' For Apache Ignite 2.11.0'><div class="listingblock">
+<div class="content">
+<pre class="rouge highlight"><code data-lang="xml"><span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-spring-tx-ext<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite-spring-tx-ext.version}<span class="nt"></version></span>
<span class="nt"></dependency></span>
<span class="nt"><dependency></span>
@@ -3371,6 +3386,48 @@
<span class="nt"></dependency></span>
<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.ignite<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>ignite-spring<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${ignite.version}<span class="nt"></version></span>
+ <span class="nt"><exclusions></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-core<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-aop<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-expressions<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-beans<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-jdbc<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"><exclusion></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-tx<span class="nt"></artifactId></span>
+ <span class="nt"></exclusion></span>
+ <span class="nt"></exclusions></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>spring-context<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>${spring.version}<span class="nt"></version></span>
+<span class="nt"></dependency></span>
+
+<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.springframework<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>spring-tx<span class="nt"></artifactId></span>
<span class="nt"><version></span>${spring.version}<span class="nt"></version></span>
@@ -3379,28 +3436,31 @@
</div></code-tab></code-tabs>
<div class="paragraph">
<p>Replace <code>${ignite-spring-tx-ext.version}</code>, <code>${spring.version}</code>, and
-<code>${ignite.version}</code> with an actual version of Apache Ignite Spring Transactions extension, Spring Transactions, and
-Apache Ignite dependency you are interested in, respectively.</p>
+<code>${ignite.version}</code> with an actual version of Apache Ignite Spring Transactions extension, Spring, and
+Apache Ignite dependency you need, respectively.</p>
</div>
<div class="paragraph">
-<p>The table below shows available versions of the Apache Ignite Spring Transactions extension and corresponding versions
-of the Apache Ignite each one is compatible with.</p>
+<p>The table below shows available versions of the Apache Ignite Spring Transactions extension and compatible versions
+of the Apache Ignite and Spring.</p>
</div>
<table class="tableblock frame-all grid-all stripes-even stretch">
<colgroup>
-<col style="width: 44.4444%;">
-<col style="width: 55.5556%;">
+<col style="width: 28.5714%;">
+<col style="width: 35.7142%;">
+<col style="width: 35.7144%;">
</colgroup>
<thead>
<tr>
<th class="tableblock halign-left valign-top">Apache Ignite Spring Transactions extension version</th>
-<th class="tableblock halign-left valign-top">Compatible Apache Ignite versions</th>
+<th class="tableblock halign-left valign-top">Apache Ignite versions</th>
+<th class="tableblock halign-left valign-top">Spring versions</th>
</tr>
</thead>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">1.0.0</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">All versions since 2.8.0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">All versions since 2.11.0</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">All versions since 4.3.0</p></td>
</tr>
</tbody>
</table>
@@ -3418,8 +3478,8 @@
<div class="sect2">
<h3 id="cluster-connection-configuration">Cluster Connection Configuration</h3>
<div class="paragraph">
-<p>Cluster connection configuration defines Apache Ignite node that <code>SpringTransactionManager</code> uses to access the cluster.
-To do this, you can use the following approaches.</p>
+<p>Cluster connection configuration defines Apache Ignite node used by <code>SpringTransactionManager</code> to access the cluster.
+There are several approaches to do this:</p>
</div>
<div class="admonitionblock note">
<table>
@@ -3462,14 +3522,14 @@
<span class="na">xsi:schemaLocation=</span><span class="s">"
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"</span><span class="nt">></span>
- <span class="err"><</span>-- Provide Apache Ignite instance name. -->
+ <span class="c"><!-- Provide Apache Ignite instance name. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"transactionManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.transactions.spring.SpringTransactionManager"</span><span class="nt">></span>
<span class="nt"><property</span>
<span class="na">name=</span><span class="s">"igniteInstanceName"</span>
<span class="na">value=</span><span class="s">"<name of the Apache Ignite node instance>"</span><span class="nt">/></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Use annotation-driven transaction configuration. -->
+ <span class="c"><!-- Use annotation-driven transaction configuration. --></span>
<span class="nt"><tx:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
@@ -3504,7 +3564,7 @@
<span class="na">xsi:schemaLocation=</span><span class="s">"
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"</span><span class="nt">></span>
- <span class="err"><</span>-- Provide configuration bean. -->
+ <span class="c"><!-- Provide configuration bean. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"transactionManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.transactions.spring.SpringTransactionManager"</span><span class="nt">></span>
<span class="nt"><property</span> <span class="na">name=</span><span class="s">"configuration"</span><span class="nt">></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"gridCfg"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.configuration.IgniteConfiguration"</span><span class="nt">></span>
@@ -3513,7 +3573,7 @@
<span class="nt"></property></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Use annotation-driven transaction configuration. -->
+ <span class="c"><!-- Use annotation-driven transaction configuration. --></span>
<span class="nt"><tx:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
@@ -3545,14 +3605,14 @@
<span class="na">xsi:schemaLocation=</span><span class="s">"
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"</span><span class="nt">></span>
- <span class="err"><</span>-- Provide configuration file path. -->
+ <span class="c"><!-- Provide configuration file path. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"transactionManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.transactions.spring.SpringTransactionManager"</span><span class="nt">></span>
<span class="nt"><property</span>
<span class="na">name=</span><span class="s">"configurationPath"</span>
<span class="na">value=</span><span class="s">"<path to an Apache Ignite configuration XML file (path can be absolute or relative to `IGNITE_HOME`)"</span><span class="nt">/></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Use annotation-driven transaction configuration. -->
+ <span class="c"><!-- Use annotation-driven transaction configuration. --></span>
<span class="nt"><tx:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
@@ -3593,7 +3653,7 @@
<h3 id="transaction-concurrency-mode-configuration">Transaction Concurrency Mode Configuration</h3>
<div class="paragraph">
<p>The transaction concurrency mode configuration defines the
-<a href="https://ignite.apache.org/docs/latest/key-value-api/transactions#concurrency-modes-and-isolation-levels" target="_blank" rel="noopener">Apache Ignite</a>
+<a href="https://ignite.apache.org/docs/latest/key-value-api/transactions#concurrency-modes-and-isolation-levels" target="_blank" rel="noopener">Apache Ignite transaction concurrency mode</a>
that a manager will apply to all transactions that it processes.</p>
</div>
<code-tabs><code-tab data-tab='Java'><div class="listingblock">
@@ -3619,13 +3679,13 @@
<span class="na">xsi:schemaLocation=</span><span class="s">"
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"</span><span class="nt">></span>
- <span class="err"><</span>-- Provide Apache Ignite instance name. -->
+ <span class="c"><!-- Provide Apache Ignite instance name. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"transactionManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.transactions.spring.SpringTransactionManager"</span><span class="nt">></span>
<span class="c"><!-- Here is appropriate connection configuration. --></span>
<span class="nt"><property</span> <span class="na">name=</span><span class="s">"transactionConcurrency"</span> <span class="na">value=</span><span class="s">"OPTIMISTIC"</span><span class="nt">/></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Use annotation-driven transaction configuration. -->
+ <span class="c"><!-- Use annotation-driven transaction configuration. --></span>
<span class="nt"><tx:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
@@ -3691,7 +3751,7 @@
<span class="nt"><property</span> <span class="na">name=</span><span class="s">"transactionConcurrency"</span> <span class="na">value=</span><span class="s">"PESSIMISTIC"</span><span class="nt">/></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Use annotation-driven transaction configuration. -->
+ <span class="c"><!-- Use annotation-driven transaction configuration. --></span>
<span class="nt"><tx:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
@@ -3724,8 +3784,8 @@
<div class="sect2">
<h3 id="cluster-connection-configuration-2">Cluster Connection Configuration</h3>
<div class="paragraph">
-<p>Cluster connection configuration defines Apache Ignite thin client instance that <code>IgniteClientSpringTransactionManager</code>
-uses to access the cluster.</p>
+<p>Cluster connection configuration defines Apache Ignite thin client instance used by <code>IgniteClientSpringTransactionManager</code>
+to access the cluster.</p>
</div>
<code-tabs><code-tab data-tab='Java'><div class="listingblock">
<div class="content">
@@ -3734,7 +3794,7 @@
<span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">SpringApplicationConfiguration</span> <span class="o">{</span>
<span class="nd">@Bean</span>
<span class="kd">public</span> <span class="nc">IgniteClient</span> <span class="nf">igniteClient</span><span class="o">()</span> <span class="o">{</span>
- <span class="k">return</span> <span class="nc">Ignition</span><span class="o">.</span><span class="na">startClient</span><span class="o">(</span><span class="k">new</span> <span class="nc">ClientConfiguration</span><span class="o">().</span><span class="na">setAddresses</span><span class="o">(</span><span class="err">"</span><span class="mf">127.0</span><span class="o">.</span><span class="mf">0.1</span><span class="o">:</span><span class="mi">10800</span><span class="o">));</span>
+ <span class="k">return</span> <span class="nc">Ignition</span><span class="o">.</span><span class="na">startClient</span><span class="o">(</span><span class="k">new</span> <span class="nc">ClientConfiguration</span><span class="o">().</span><span class="na">setAddresses</span><span class="o">(</span><span class="s">"127.0.0.1:10800"</span><span class="o">));</span>
<span class="o">}</span>
<span class="nd">@Bean</span>
@@ -3757,7 +3817,7 @@
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"</span><span class="nt">></span>
<span class="c"><!--
Note that org.apache.ignite.IgniteClientSpringBean is available since Apache Ignite 2.11.0 version.
- For Apache Ignite versions earlier than 2.11.0 org.apache.ignite.client.IgniteClient bean should be created
+ For Apache Ignite 2.10.0 and earlier `org.apache.ignite.client.IgniteClient` bean should be created
manually with concern of its connection to the Ignite cluster.
--></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"igniteClient"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.IgniteClientSpringBean"</span><span class="nt">></span>
@@ -3772,12 +3832,12 @@
<span class="nt"></property></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Provide Apache Ignite client instance. -->
+ <span class="c"><!-- Provide Apache Ignite client instance. --></span>
<span class="nt"><bean</span> <span class="na">id=</span><span class="s">"transactionManager"</span> <span class="na">class=</span><span class="s">"org.apache.ignite.transactions.spring.IgniteClientSpringTransactionManager"</span><span class="nt">></span>
<span class="nt"><property</span> <span class="na">name=</span><span class="s">"clientInstance"</span> <span class="na">ref=</span><span class="s">"igniteClientBean"</span><span class="nt">/></span>
<span class="nt"></bean></span>
- <span class="err"><</span>-- Use annotation-driven transaction configuration. -->
+ <span class="c"><!-- Use annotation-driven transaction configuration. --></span>
<span class="nt"><tx:annotation-driven/></span>
<span class="nt"></beans></span></code></pre>
</div>
@@ -3880,11 +3940,11 @@
debug: false,
});
</script>
-<script type='module' src='/assets/js/index.js?1634150558' async crossorigin></script>
-<script type='module' src='/assets/js/versioning.js?1634150558' async crossorigin></script>
+<script type='module' src='/assets/js/index.js?1636554015' async crossorigin></script>
+<script type='module' src='/assets/js/versioning.js?1636554015' async crossorigin></script>
-<link rel="stylesheet" href="/assets/css/styles.css?1634150558" media="print" onload="this.media='all'">
-<noscript><link media="all" rel="stylesheet" href="/assets/css/styles.css?1634150558"></noscript>
+<link rel="stylesheet" href="/assets/css/styles.css?1636554015" media="print" onload="this.media='all'">
+<noscript><link media="all" rel="stylesheet" href="/assets/css/styles.css?1636554015"></noscript>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" media="print" onload="this.media='all'">
<noscript><link media="all" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"></noscript>
