GG-23069

.gitignore

@@ -29,6 +29,7 @@ git-patch-prop-local.sh
 **/dotnet/libs/
 *.classname*
 *.exe
+.mvn/
 
 #Visual Studio files
 *.[Oo]bj
@@ -93,6 +94,7 @@ packages
 /modules/platforms/cpp/missing
 /modules/platforms/cpp/odbc-test/ignite-odbc-tests
 /modules/platforms/cpp/stamp-h1
+/modules/platforms/cpp/thin-client-test/ignite-thin-client-tests
 
 #Files related to ML manual-runnable tests
-/modules/ml/src/test/resources/manualrun/trees/columntrees.manualrun.properties
+/modules/ml/src/test/resources/manualrun/trees/columntrees.manualrun.properties

DEVNOTES.txt

@@ -75,36 +75,39 @@ Instructions can be found at modules/platforms/cpp/DEVNOTES.txt.
 
 Apache Ignite RPM Package Build Instructions
 ============================================
-1) Install dependencies
+1) Build Apache Ignite binary archive (instructions above)
 
-        yum install -y rpmdevtools rpm-build
+2) Run packaging script and follow messages if they required interaction
 
-2) Create directory layout
+        packaging/package.sh --rpm
 
-        rpmdev-setuptree
+   Packages will be available in packaging/ directory
 
-3) Copy build specification and additional sources required for build
 
-        cp -rfv packaging/rpm/* ~/rpmbuild
+Apache Ignite DEB Package Build Instructions
+============================================
+1) Build Apache Ignite binary archive (instructions above)
 
-4) Copy built binary from target/bin to sources directory
+2) Build Apache Ignite RPM package (also above)
 
-        cp -rfv target/bin/apache-ignite-<version>-bin.zip ~/rpmbuild/SOURCES/apache-ignite.zip
+3) Run packaging script and follow messages if they required interaction
 
-5) Run build process
+        packaging/package.sh --deb
 
-        rpmbuild -bb ~/rpmbuild/SPECS/apache-ignite.spec
+   Packages will be available in packaging/ directory
 
-   NOTE: to build also SRPM package, run with -ba flag instead
+   NOTE: to build both packages type at once, run
 
-   Package will be available in ~/rpmbuild/RPMS/noarch
+        packaging/package.sh --rpm --deb
 
 
-Install and Run Apache Ignite from RPM
-======================================
-1) Install package
+Install and Run Apache Ignite from packages
+===========================================
+1) Install package with YUM or APT respectively
 
-        yum localinstall -y apache-ignite-<version>.rpm
+        yum localinstall -y apache-ignite-<version>.noarch.rpm
+            or
+        dpkg -i apache-ignite_<version>_all.deb
 
 2) Start Apache Ignite service
 

NOTICE

@@ -1,5 +1,5 @@
 Apache Ignite
-Copyright 2018 The Apache Software Foundation
+Copyright 2019 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

assembly/NOTICE_HADOOP

@@ -1,5 +1,5 @@
 Apache Ignite
-Copyright 2018 The Apache Software Foundation
+Copyright 2019 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

assembly/release-fabric-base.xml

@@ -120,6 +120,12 @@
             <outputDirectory>/platforms/cpp/common</outputDirectory>
         </fileSet>
 
+        <!-- Move CPP "network" module. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/network</directory>
+            <outputDirectory>/platforms/cpp/network</outputDirectory>
+        </fileSet>
+
         <!-- Move CPP "jni" module. -->
         <fileSet>
             <directory>modules/platforms/cpp/jni</directory>
@@ -156,6 +162,12 @@
             <outputDirectory>/platforms/cpp/binary</outputDirectory>
         </fileSet>
 
+        <!-- Move CPP "thin-client" module. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/thin-client</directory>
+            <outputDirectory>/platforms/cpp/thin-client</outputDirectory>
+        </fileSet>
+
         <!-- Move CPP licenses. -->
         <fileSet>
             <directory>modules/platforms/licenses</directory>
@@ -167,18 +179,6 @@
             <directory>modules/clients/target/cppdoc/html</directory>
             <outputDirectory>/platforms/cpp/docs</outputDirectory>
         </fileSet>
-
-        <!-- Move CPP binaries. -->
-        <fileSet>
-            <directory>modules/platforms/cpp/bin</directory>
-            <outputDirectory>/platforms/cpp/bin</outputDirectory>
-        </fileSet>
-
-        <!-- Move CPP binaries. -->
-        <fileSet>
-            <directory>modules/platforms/cpp/bin</directory>
-            <outputDirectory>/platforms/cpp/bin</outputDirectory>
-        </fileSet>
 
         <!-- Move CPP binaries. -->
         <fileSet>

assembly/release-scala.xml

@@ -35,6 +35,7 @@
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>**/ignitevisorcmd.bat</include>
+                <include>**/include/visorcmd/node_startup_by_ssh.sample.ini</include>
             </includes>
         </fileSet>
 

bin/control.bat

@@ -104,7 +104,7 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0%
 ::
 call "%SCRIPTS_HOME%\include\setenv.bat"
 call "%SCRIPTS_HOME%\include\build-classpath.bat"
-set CP=%IGNITE_LIBS%
+set CP=%IGNITE_LIBS%;%IGNITE_HOME%\libs\optional\ignite-zookeeper\*
 
 ::
 :: Process 'restart'.
@@ -156,6 +156,11 @@ if %ERRORLEVEL% equ 0 (
     if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms256m -Xmx1g
 )
 
+::
+:: Uncomment to enable experimental commands [--wal]
+::
+:: set JVM_OPTS=%JVM_OPTS% -DIGNITE_ENABLE_EXPERIMENTAL_COMMAND=true
+
 ::
 :: Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
 ::

bin/control.sh

@@ -54,7 +54,7 @@ fi
 #
 . "${SCRIPTS_HOME}"/include/setenv.sh
 . "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in the binary release.
-CP="${IGNITE_LIBS}"
+CP="${IGNITE_LIBS}:${IGNITE_HOME}/libs/optional/ignite-zookeeper/*"
 
 RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator)
 
@@ -92,6 +92,11 @@ if [ -z "$JVM_OPTS" ] ; then
     fi
 fi
 
+#
+# Uncomment to enable experimental commands [--wal]
+#
+# JVM_OPTS="${JVM_OPTS} -DIGNITE_ENABLE_EXPERIMENTAL_COMMAND=true"
+
 #
 # Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
 #

bin/include/visorcmd/node_startup_by_ssh.sample.ini

@@ -0,0 +1,74 @@
+;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.
+
+# Section with settings for host1:
+[host1]
+# IP address or host name:
+host=192.168.1.1
+
+# SSH port:
+port=2200
+
+# SSH login:
+uname=userName
+
+# SSH password:
+passwd=password
+
+# SSH key path:
+key=~/.ssh/id_rsa
+
+# Number of nodes to start:
+nodes=1
+
+# Ignite home path:
+igniteHome=/usr/lib/ignite
+
+# Ignite config path:
+cfg=examples/example-ignite.xml
+
+# Ignite node start script:
+script=bin/ignite.sh
+
+# Section with settings for host2:
+[host2]
+# IP address or host name:
+host=192.168.1.2
+
+# Section with default settings. Used if value not defined in host section.
+[defaults]
+# SSH port:
+port=22
+
+# SSH login:
+uname=userName
+
+# SSH password:
+passwd=password
+
+# SSH key path:
+key=~/.ssh/id_rsa
+
+# Number of nodes to start:
+nodes=3
+
+# Ignite home path:
+igniteHome=/usr/lib/ignite
+
+# Ignite config path:
+cfg=examples/example-ignite.xml
+
+# Ignite node start script:
+script=bin/ignite.sh

docker/web-console/standalone/Dockerfile

@@ -0,0 +1,84 @@
+#
+# 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.
+#
+
+#~~~~~~~~~~~~~~~~~~#
+#  Frontend build  #
+#~~~~~~~~~~~~~~~~~~#
+FROM node:10-stretch as frontend-build
+
+ENV NPM_CONFIG_LOGLEVEL error
+
+WORKDIR /opt/web-console
+
+# Install node modules and build sources
+COPY frontend frontend
+RUN cd frontend && \
+    npm install --no-optional && \
+    npm run build
+
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+#  Web Console Standalone assemble  #
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+FROM node:10-stretch
+
+ENV NPM_CONFIG_LOGLEVEL error
+
+# Install global node packages
+RUN npm install -g pm2
+
+# Update software sources and install missing applications
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
+    && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list
+    apt update && \
+    apt install -y --no-install-recommends \
+        nginx-light \
+        mongodb-org-server \
+        dos2unix && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/web-console
+
+# Install node modules for backend
+COPY backend/package*.json backend/
+RUN cd backend && \
+    npm install --no-optional --production
+
+# Copy and build sources
+COPY backend backend
+RUN cd backend && \
+    npm run build
+
+# Copy Ignite Web Agent module package
+COPY ignite-web-agent-*.zip backend/agent_dists
+
+# Copy previously built frontend
+COPY --from=frontend-build /opt/web-console/frontend/build static
+
+# Copy and fix entrypoint script
+COPY docker-entrypoint.sh docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh \
+    && dos2unix docker-entrypoint.sh
+
+# Copy nginx configuration
+COPY nginx/* /etc/nginx/
+
+EXPOSE 80
+
+ENTRYPOINT ["/opt/web-console/docker-entrypoint.sh"]
+

examples/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>ignite-examples</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.6-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -298,4 +298,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>