xtern · xtern · Jan 30, 2020 · Oct 27, 2020 · Oct 27, 2020 · Oct 27, 2020
diff --git a/assembly/dependencies-apache-ignite-slim.xml b/assembly/dependencies-apache-ignite-slim.xml
@@ -145,20 +145,17 @@
                 <!-- Removed from slim packaging are: -->
                 <exclude>org.apache.ignite:ignite-aop</exclude>
                 <exclude>org.apache.ignite:ignite-aws</exclude>
-                <exclude>org.apache.ignite:ignite-camel</exclude>
                 <exclude>org.apache.ignite:ignite-cassandra-serializers</exclude>
                 <exclude>org.apache.ignite:ignite-cassandra-store</exclude>
                 <exclude>org.apache.ignite:ignite-cloud</exclude>
                 <exclude>org.apache.ignite:ignite-direct-io</exclude>
                 <exclude>org.apache.ignite:ignite-gce</exclude>
                 <exclude>org.apache.ignite:ignite-jcl</exclude>
-                <exclude>org.apache.ignite:ignite-jms11</exclude>
                 <exclude>org.apache.ignite:ignite-mesos</exclude>
                 <exclude>org.apache.ignite:ignite-ml</exclude>
                 <exclude>org.apache.ignite:ignite-ml-h2o-model-parser</exclude>
                 <exclude>org.apache.ignite:ignite-ml-spark-model-parser</exclude>
                 <exclude>org.apache.ignite:ignite-ml-xgboost-model-parser</exclude>
-                <exclude>org.apache.ignite:ignite-mqtt</exclude>
                 <exclude>org.apache.ignite:ignite-osgi</exclude>
                 <exclude>org.apache.ignite:ignite-osgi-karaf</exclude>
                 <exclude>org.apache.ignite:ignite-osgi-paxlogging</exclude>
@@ -167,7 +164,6 @@
                 <exclude>org.apache.ignite:ignite-spark</exclude>
                 <exclude>org.apache.ignite:ignite-spark-2.4</exclude>
                 <exclude>org.apache.ignite:ignite-ssh</exclude>
-                <exclude>org.apache.ignite:ignite-storm</exclude>
                 <exclude>org.apache.ignite:ignite-web</exclude>
                 <exclude>org.apache.ignite:ignite-yarn</exclude>
                 <exclude>org.apache.ignite:ignite-zookeeper</exclude>

diff --git a/docs/README.adoc b/docs/README.adoc
@@ -68,6 +68,46 @@ $ docker run -v "$PWD:/srv/jekyll" -p 4000:4000 jekyll/jekyll:latest jekyll s
 
 Open `http://localhost:4000/docs[window=_blank]` in your browser.
 
+=== Troubleshooting
+
+Below are some issues you might hit during an installation of the Jekyll environment or while building the tutorials.
+Let us know if you come across a new and found a workaround.
+
+==== MacOS: Issues with FFI library during Jekyll installation
+
+You should see an error trace similar to this: https://github.com/ffi/ffi/issues/653
+
+Attempt to fix the problem by following this sequence of commands (typically it's the last command only):
+
+[source, text]
+----
+brew reinstall libffi
+export LDFLAGS="-L/usr/local/opt/libffi/lib"
+export CPPFLAGS="-I/usr/local/opt/libffi/include"
+export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig"
+gem install --user-install bundler jekyll
+----
+
+==== MacOS: jekyll-asciidoc gem is not installed by default
+
+Try to follow this procedure to fix the issue.
+
+* Comment out the `rm -rf $tmp_dir` at the very end of the `build.sh` script, so that the temp folder is not deleted after the execution.
+* Run `build.sh` (fails with `Could not find gem 'jekyll-asciidoc'...` error).
+* Go to `tmp/web_site` folder.
+* Run `bundle install`.
+* Revert the `build.sh` script and run it again.
+
+==== MacOS: can't build project due to inability to load openssl
+
+You should see an error like this:
+
+`LoadError: dlopen(/Users/dmagda/.rbenv/versions/2.6.2/lib/ruby/2.6.0/x86_64-darwin18/digest/sha1.bundle, 9): Library not loaded: /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
+   Referenced from: /Users/dmagda/.rbenv/versions/2.6.2/lib/ruby/2.6.0/x86_64-darwin18/digest/sha1.bundle`
+
+Try to upgrade Ruby, rbenv to the latest version (2.7.1) and then reinstall Jekyll. Use the official instructions:
+https://jekyllrb.com/docs/installation/
+
 == How to Contribute
 
 If you want to contribute to the documentation, add or modify the relevant page in the `docs/_docs` directory.

diff --git a/docs/_docs/clustering/network-configuration.adoc b/docs/_docs/clustering/network-configuration.adoc
@@ -49,13 +49,26 @@ tab:C++[unsupported]
 The following table describes some most important properties of `TcpDiscoverySpi`.
 You can find the complete list of properties in the javadoc:org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi[] javadoc.
 
+[CAUTION]
+====
+You should initialize the `IgniteConfiguration.localHost` or `TcpDiscoverySpi.localAddress` parameter with the network
+interface that will be used for inter-node communication. By default, a node binds to and listens on all available IP
+addresses of an environment it's running on. It can prolong node failures detection if some of the node's addresses are
+not reachable from other cluster nodes.
+====
+
 [cols="1,2,1",opts="header"]
 |===
 |Property | Description| Default Value
-| `localAddress`| Local host IP address used for discovery. | By default, the node uses the first non-loopback address it finds. If there is no non-loopback address available, then `java.net.InetAddress.getLocalHost()` is used.
+| `localAddress`| Local host IP address used for discovery. If set, overrides the `IgniteConfiguration.localHost` setting. | By default, a node binds to all available network addresses. If there is a non-loopback address available, then java.net.InetAddress.getLocalHost() is used.
 | `localPort`  | The port that the node binds to. If set to a non-default value, other cluster nodes must know this port to be able to discover the node. | `47500`
 | `localPortRange`| If the `localPort` is busy, the node attempts to bind to the next port (incremented by 1) and continues this process until it finds a free port. The `localPortRange` property defines the number of ports the node will try (starting from `localPort`).
    | `100`
+| `soLinger`| Specifies a linger-on-close timeout of TCP sockets used by Discovery SPI. See Java `Socket.setSoLinger` API
+for details on how to adjust this setting. In Ignite, the timeout defaults to a non-negative value to prevent
+link:https://bugs.openjdk.java.net/browse/JDK-8219658[potential deadlocks with SSL connections, window=_blank] but,
+as a side effect, this can prolong the detection of cluster node failures. Alternatively, update your JRE version to the
+one with the SSL issue fixed and adjust this setting accordingly. | `0`
 | `reconnectCount` | The number of times the node tries to (re)establish connection to another node. |`10`
 | `networkTimeout` |  The maximum network timeout in milliseconds for network operations. |`5000`
 | `socketTimeout` |  The socket operations timeout. This timeout is used to limit connection time and write-to-socket time. |`5000`
@@ -110,7 +123,7 @@ You can find the list of all properties in the javadoc:org.apache.ignite.spi.com
 [cols="1,2,1",opts="header"]
 |===
 |Property | Description| Default Value
-| `localAddress` | The local address for the communication SPI to bind to. |
+| `localAddress` | The local address for the communication SPI to bind to. If set, overrides the `IgniteConfiguration.localHost` setting. |
 
 | `localPort` | The local port that the node uses for communication.  | `47100`
 

diff --git a/docs/_docs/extensions-and-integrations/spring/spring-data.adoc b/docs/_docs/extensions-and-integrations/spring/spring-data.adoc
@@ -32,12 +32,18 @@ tab:pom.xml[]
 ----
 <dependency>
     <groupId>org.apache.ignite</groupId>
-    <artifactId>ignite-spring-data</artifactId>
+    <artifactId>ignite-spring-data_2.2</artifactId>
     <version>{ignite.version}</version>
 </dependency>
 ----
 --
 
+[NOTE]
+====
+If your Spring Data version is earlier than Spring Data 2.2 then set `ignite-spring-data_2.0`
+or `ignite-spring-data` as an `artifactId` in the pom.xml configuration.
+====
+
 == Apache Ignite Repository
 
 Apache Ignite introduces a special `IgniteRepository` interface that extends default `CrudRepository`. This interface
@@ -220,7 +226,7 @@ System.out.println("\n>>> Top Person with surname 'Smith': " +
 
 == Example
 
-The complete example is available on link:{githubUrl}/examples/src/main/java/org/apache/ignite/examples/springdata[GitHub, window=_blank].
+The complete example is available on link: https://github.com/apache/ignite-extensions/tree/master/modules/spring-data-2.0-ext/examples/main[GitHub, windows="_blank"]
 
 == Tutorial
 

diff --git a/docs/_docs/extensions-and-integrations/streaming/camel-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/camel-streamer.adoc
@@ -43,7 +43,7 @@ to interact with Ignite Caches, Compute, Events, Messaging, etc. from within a C
 
 == Maven Dependency
 
-To make use of the `ignite-camel` streamer, you need to add the following dependency:
+To make use of the `ignite-camel-ext` streamer, you need to add the following dependency:
 
 [tabs]
 --
@@ -52,8 +52,8 @@ tab:pom.xml[]
 ----
 <dependency>
     <groupId>org.apache.ignite</groupId>
-    <artifactId>ignite-camel</artifactId>
-    <version>${ignite.version}</version>
+    <artifactId>ignite-camel-ext</artifactId>
+    <version>${ignite-camel-ext.version}</version>
 </dependency>
 ----
 --

diff --git a/docs/_docs/extensions-and-integrations/streaming/flink-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/flink-streamer.adoc
@@ -21,7 +21,7 @@ Starting data transfer to Ignite cache can be done with the following steps.
 
 . Import Ignite Flink Sink Module in Maven Project
 If you are using Maven to manage dependencies of your project, you can add Flink module
-dependency like this (replace `${ignite.version}` with actual Ignite version you are
+dependency like this (replace `${ignite-flink-ext.version}` with actual Ignite Flink Extension version you are
 interested in):
 +
 [tabs]
@@ -38,8 +38,8 @@ tab:pom.xml[]
         ...
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-flink</artifactId>
-            <version>${ignite.version}</version>
+            <artifactId>ignite-flink-ext</artifactId>
+            <version>${ignite-flink-ext.version}</version>
         </dependency>
         ...
     </dependencies>

diff --git a/docs/_docs/extensions-and-integrations/streaming/flume-sink.adoc b/docs/_docs/extensions-and-integrations/streaming/flume-sink.adoc
@@ -41,7 +41,7 @@ plugins.d/
  `-- libext
      |-- cache-api-1.0.0.jar
      |-- ignite-core-x.x.x.jar
-     |-- ignite-flume-x.x.x.jar <-- IgniteSink
+     |-- ignite-flume-ext.x.x.x.jar <-- IgniteSink
      |-- ignite-spring-x.x.x.jar
      |-- spring-aop-4.1.0.RELEASE.jar
      |-- spring-beans-4.1.0.RELEASE.jar

diff --git a/docs/_docs/extensions-and-integrations/streaming/jms-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/jms-streamer.adoc
@@ -116,8 +116,8 @@ tab:pom.xml[]
 ----
 <dependency>
     <groupId>org.apache.ignite</groupId>
-    <artifactId>ignite-jms11</artifactId>
-    <version>${ignite.version}</version>
+    <artifactId>ignite-jms11-ext</artifactId>
+    <version>${ignite-jms11-ext.version}</version>
 </dependency>
 ----
 --
diff --git a/docs/_docs/extensions-and-integrations/streaming/kafka-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/kafka-streamer.adoc
@@ -153,7 +153,7 @@ http://node1:8080/ignite?cmd=size&cacheName=cache1
 == Streaming data with Ignite Kafka Streamer Module
 
 If you are using Maven to manage dependencies of your project, first of all you will have to add Kafka Streamer module
-dependency like this (replace `${ignite.version}` with actual Ignite version you are interested in):
+dependency like this (replace `${ignite-kafka-ext.version}` with actual Ignite Kafka Extension version you are interested in):
 
 [tabs]
 --
@@ -169,8 +169,8 @@ tab:pom.xml[]
         ...
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-kafka</artifactId>
-            <version>${ignite.version}</version>
+            <artifactId>ignite-kafka-ext</artifactId>
+            <version>${ignite-kafka-ext.version}</version>
         </dependency>
         ...
     </dependencies>

diff --git a/docs/_docs/extensions-and-integrations/streaming/mqtt-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/mqtt-streamer.adoc
@@ -73,4 +73,4 @@ streamer.start();
 ----
 --
 
-Refer to the Javadocs of the `ignite-mqtt` module for more info on the available options.
+Refer to the Javadocs of the `ignite-mqtt-ext` module for more info on the available options.
diff --git a/docs/_docs/extensions-and-integrations/streaming/rocketmq-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/rocketmq-streamer.adoc
@@ -20,7 +20,7 @@ to Ignite.
 To use Ignite RocketMQ Streamer module
 
 . Import it to your Maven project. If you are using Maven to manage dependencies of your project, you can add an Ignite
-RocketMQ module dependency like this (replace `${ignite.version}` with actual Ignite version you are interested in):
+RocketMQ module dependency like this (replace `${ignite-rocketmq-ext.version}` with actual Ignite RocketMQ Extension version you are interested in):
 +
 [tabs]
 --
@@ -36,8 +36,8 @@ tab:pom.xml[]
         ...
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-rocketmq</artifactId>
-            <version>${ignite.version}</version>
+            <artifactId>ignite-rocketmq-ext</artifactId>
+            <version>${ignite-rocketmq-ext.version}</version>
         </dependency>
         ...
     </dependencies>

diff --git a/docs/_docs/extensions-and-integrations/streaming/storm-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/storm-streamer.adoc
@@ -19,7 +19,7 @@ Apache Ignite Storm Streamer module provides streaming via http://storm.apache.o
 Starting data transfer to Ignite can be done with the following steps.
 
 . Import Ignite Storm Streamer Module In Maven Project. If you are using Maven to manage dependencies of your project,
-you can add Storm module dependency like this (replace `${ignite.version}` with actual Ignite version you are interested in):
+you can add Storm module dependency like this (replace `${ignite-storm-ext.version}` with actual Ignite Storm Extension version you are interested in):
 +
 [tabs]
 --
@@ -35,8 +35,8 @@ tab:pom.xml[]
         ...
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-storm</artifactId>
-            <version>${ignite.version}</version>
+            <artifactId>ignite-storm-ext</artifactId>
+            <version>${ignite-storm-ext.version}</version>
         </dependency>
         ...
     </dependencies>

diff --git a/docs/_docs/extensions-and-integrations/streaming/twitter-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/twitter-streamer.adoc
@@ -18,7 +18,7 @@ Ignite Twitter Streamer module consumes tweets from Twitter and feeds the transf
 
 To stream data from Twitter into Ignite, you need to:
 
-. Import Ignite Twitter Module with Maven and replace `${ignite.version}` with the actual Ignite version you are interested in.
+. Import Ignite Twitter Module with Maven and replace `${ignite-twitter-ext.version}` with the actual Ignite Twitter Extension version you are interested in.
 +
 [tabs]
 --
@@ -27,8 +27,8 @@ tab:pom.xml[]
 ----
 <dependency>
   <groupId>org.apache.ignite</groupId>
-  <artifactId>ignite-twitter</artifactId>
-  <version>${ignite.version}</version>
+  <artifactId>ignite-twitter-ext</artifactId>
+  <version>${ignite-twitter-ext.version}</version>
 </dependency>
 ----
 --

diff --git a/docs/_docs/extensions-and-integrations/streaming/zeromq-streamer.adoc b/docs/_docs/extensions-and-integrations/streaming/zeromq-streamer.adoc
@@ -29,8 +29,8 @@ tab:pom.xml[]
     ...
     <dependency>
         <groupId>org.apache.ignite</groupId>
-        <artifactId>ignite-zeromq</artifactId>
-        <version>${ignite.version}</version>
+        <artifactId>ignite-zeromq-ext</artifactId>
+        <version>${ignite-zeromq-ext.version}</version>
     </dependency>
     ...
 </dependencies>

diff --git a/docs/_docs/machine-learning/binary-classification/decision-trees.adoc b/docs/_docs/machine-learning/binary-classification/decision-trees.adoc
@@ -39,12 +39,12 @@ The model works this way - the split process stops when either the algorithm has
 
 == Model
 
-The Model in a decision tree classification is represented by the class `DecisionTreeNode`. We can make a prediction for a given vector of features in the following way:
+The Model in a decision tree classification is represented by the class `DecisionTreeModel`. We can make a prediction for a given vector of features in the following way:
 
 
 [source, java]
 ----
-DecisionTreeNode mdl = ...;
+DecisionTreeModel mdl = ...;
 
 double prediction = mdl.apply(observation);
 ----
@@ -68,7 +68,7 @@ DecisionTreeClassificationTrainer trainer = new DecisionTreeClassificationTraine
 );
 
 // Train model.
-DecisionTreeNode mdl = trainer.fit(ignite, dataCache, vectorizer);
+DecisionTreeModel mdl = trainer.fit(ignite, dataCache, vectorizer);
 ----
 
 

diff --git a/docs/_docs/machine-learning/importing-model/model-import-from-apache-spark.adoc b/docs/_docs/machine-learning/importing-model/model-import-from-apache-spark.adoc
@@ -71,7 +71,7 @@ To load in Ignite ML you should use SparkModelParser class via method parse() ca
 
 [source, java]
 ----
-DecisionTreeNode mdl = (DecisionTreeNode)SparkModelParser.parse(
+DecisionTreeModel mdl = (DecisionTreeModel)SparkModelParser.parse(
    SPARK_MDL_PATH,
    SupportedSparkModels.DECISION_TREE
 );

diff --git a/docs/_docs/machine-learning/model-selection/cross-validation.adoc b/docs/_docs/machine-learning/model-selection/cross-validation.adoc
@@ -27,7 +27,7 @@ Let’s imagine that we have a trainer, a training set and we want to make cross
 DecisionTreeClassificationTrainer trainer = new DecisionTreeClassificationTrainer(4, 0);
 
 // Create cross-validation instance
-CrossValidation<DecisionTreeNode, Integer, Vector> scoreCalculator
+CrossValidation<DecisionTreeModel, Integer, Vector> scoreCalculator
   = new CrossValidation<>();
 
 // Set up the cross-validation process
@@ -67,7 +67,7 @@ Pipeline<Integer, Vector, Integer, Double> pipeline
 
 
 // Create cross-validation instance
-CrossValidation<DecisionTreeNode, Integer, Vector> scoreCalculator
+CrossValidation<DecisionTreeModel, Integer, Vector> scoreCalculator
   = new CrossValidation<>();
 
 // Set up the cross-validation process

diff --git a/docs/_docs/machine-learning/model-selection/pipeline-api.adoc b/docs/_docs/machine-learning/model-selection/pipeline-api.adoc
@@ -64,7 +64,7 @@ Preprocessor<Integer, Vector> normalizationPreprocessor = new NormalizationTrain
 
 DecisionTreeClassificationTrainer trainerCV = new DecisionTreeClassificationTrainer();
 
-CrossValidation<DecisionTreeNode, Integer, Vector> scoreCalculator = new CrossValidation<>();
+CrossValidation<DecisionTreeModel, Integer, Vector> scoreCalculator = new CrossValidation<>();
 
 ParamGrid paramGrid = new ParamGrid()
   .addHyperParam("maxDeep", trainerCV::withMaxDeep, new Double[] {1.0, 2.0, 3.0, 4.0, 5.0, 10.0})
@@ -101,7 +101,7 @@ Pipeline<Integer, Vector, Integer, Double> pipeline = new Pipeline<Integer, Vect
   .addPreprocessingTrainer(new MinMaxScalerTrainer<Integer, Vector>())
   .addTrainer(trainer);
 
-CrossValidation<DecisionTreeNode, Integer, Vector> scoreCalculator = new CrossValidation<>();
+CrossValidation<DecisionTreeModel, Integer, Vector> scoreCalculator = new CrossValidation<>();
 
 ParamGrid paramGrid = new ParamGrid()
   .addHyperParam("maxDeep", trainer::withMaxDeep, new Double[] {1.0, 2.0, 3.0, 4.0, 5.0, 10.0})

diff --git a/docs/_docs/machine-learning/regression/decision-trees-regression.adoc b/docs/_docs/machine-learning/regression/decision-trees-regression.adoc
@@ -39,12 +39,12 @@ The model works this way - the split process stops when either the algorithm has
 
 == Model
 
-The Model in a decision tree classification is represented by the class `DecisionTreeNode`. We can make a prediction for a given vector of features in the following way:
+The Model in a decision tree classification is represented by the class `DecisionTreeModel`. We can make a prediction for a given vector of features in the following way:
 
 
 [source, java]
 ----
-DecisionTreeNode mdl = ...;
+DecisionTreeModel mdl = ...;
 
 double prediction = mdl.apply(observation);
 ----
@@ -67,7 +67,7 @@ DecisionTreeRegressionTrainer trainer = new DecisionTreeRegressionTrainer(
 );
 
 // Train model.
-DecisionTreeNode mdl = trainer.fit(ignite, dataCache, vectorizer);
+DecisionTreeModel mdl = trainer.fit(ignite, dataCache, vectorizer);
 ----
 
 == Examples
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,4 +73,4 @@ streamer.start(); @@
     ----
     --
-    Refer to the Javadocs of the `ignite-mqtt` module for more info on the available options.
+    Refer to the Javadocs of the `ignite-mqtt-ext` module for more info on the available options.