ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [12/12] ignite git commit: IGNITE-2823: CPP/ODBC: Splitted common in two libs. This closes #554.
Date Wed, 27 Apr 2016 08:16:13 GMT
IGNITE-2823: CPP/ODBC: Splitted common in two libs. This closes #554.


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

Branch: refs/heads/ignite-1786
Commit: 1cca0be5d1cb5a1374c8a435b2c165646fe76b6f
Parents: 50aeb71
Author: Igor Sapego <isapego@gridgain.com>
Authored: Wed Apr 27 11:15:40 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Apr 27 11:15:41 2016 +0300

----------------------------------------------------------------------
 assembly/release-fabric-base.xml                |   18 +
 modules/platforms/cpp/DEVNOTES.txt              |   74 +-
 modules/platforms/cpp/Makefile.am               |   58 +
 modules/platforms/cpp/Makefile.amrel            |   46 +
 modules/platforms/cpp/README.txt                |    8 +-
 modules/platforms/cpp/binary/Makefile.am        |   79 +-
 modules/platforms/cpp/binary/configure.ac       |   62 -
 .../platforms/cpp/binary/ignite-binary.pc.in    |    9 -
 .../platforms/cpp/binary/include/Makefile.am    |   56 +-
 .../cpp/binary/include/ignite/binary/binary.h   |    6 +-
 .../include/ignite/binary/binary_consts.h       |    6 +-
 .../include/ignite/binary/binary_containers.h   |    8 +-
 .../include/ignite/binary/binary_raw_reader.h   |    8 +-
 .../include/ignite/binary/binary_raw_writer.h   |    6 +-
 .../include/ignite/binary/binary_reader.h       |    8 +-
 .../binary/include/ignite/binary/binary_type.h  |    8 +-
 .../include/ignite/binary/binary_writer.h       |    6 +-
 .../platforms/cpp/binary/include/ignite/date.h  |  138 -
 .../platforms/cpp/binary/include/ignite/guid.h  |  172 --
 .../include/ignite/impl/binary/binary_common.h  |    6 +-
 .../ignite/impl/binary/binary_id_resolver.h     |    6 +-
 .../ignite/impl/binary/binary_reader_impl.h     |    8 +-
 .../include/ignite/impl/binary/binary_schema.h  |    6 +-
 .../ignite/impl/binary/binary_type_handler.h    |    6 +-
 .../ignite/impl/binary/binary_type_manager.h    |    8 +-
 .../ignite/impl/binary/binary_type_snapshot.h   |    6 +-
 .../ignite/impl/binary/binary_type_updater.h    |    8 +-
 .../impl/binary/binary_type_updater_impl.h      |   65 -
 .../include/ignite/impl/binary/binary_utils.h   |   14 +-
 .../ignite/impl/binary/binary_writer_impl.h     |    6 +-
 .../include/ignite/impl/ignite_environment.h    |  135 -
 .../include/ignite/impl/interop/interop.h       |    6 +-
 .../ignite/impl/interop/interop_input_stream.h  |    6 +-
 .../ignite/impl/interop/interop_memory.h        |   24 +-
 .../ignite/impl/interop/interop_output_stream.h |    6 +-
 .../interop/interop_stream_position_guard.h     |    6 +-
 .../cpp/binary/include/ignite/timestamp.h       |  166 --
 .../cpp/binary/project/vs/binary.vcxproj        |   28 +-
 .../binary/project/vs/binary.vcxproj.filters    |   30 -
 modules/platforms/cpp/binary/src/date.cpp       |   83 -
 modules/platforms/cpp/binary/src/guid.cpp       |   65 -
 .../src/impl/binary/binary_reader_impl.cpp      |    2 +-
 .../impl/binary/binary_type_updater_impl.cpp    |   98 -
 .../cpp/binary/src/impl/binary/binary_utils.cpp |    4 +-
 .../src/impl/binary/binary_writer_impl.cpp      |    2 +-
 .../cpp/binary/src/impl/ignite_environment.cpp  |  185 --
 .../src/impl/interop/interop_input_stream.cpp   |    2 +-
 .../binary/src/impl/interop/interop_memory.cpp  |   20 +-
 .../src/impl/interop/interop_output_stream.cpp  |    2 +-
 modules/platforms/cpp/binary/src/timestamp.cpp  |  117 -
 modules/platforms/cpp/common/Makefile.am        |   52 +-
 modules/platforms/cpp/common/configure.ac       |   62 -
 .../platforms/cpp/common/ignite-common.pc.in    |    9 -
 .../platforms/cpp/common/include/Makefile.am    |   16 +-
 .../common/include/ignite/common/concurrent.h   |    2 +-
 .../cpp/common/include/ignite/common/exports.h  |  182 --
 .../common/include/ignite/common/ignite_error.h |  275 --
 .../cpp/common/include/ignite/common/java.h     |  743 -----
 .../cpp/common/include/ignite/common/utils.h    |  379 +--
 .../platforms/cpp/common/include/ignite/date.h  |  138 +
 .../platforms/cpp/common/include/ignite/guid.h  |  172 ++
 .../cpp/common/include/ignite/ignite_error.h    |  284 ++
 .../cpp/common/include/ignite/timestamp.h       |  166 ++
 .../cpp/common/os/linux/include/Makefile.am     |    9 +-
 .../os/linux/include/ignite/common/common.h     |   37 +-
 .../linux/include/ignite/common/concurrent_os.h |    2 +-
 .../cpp/common/os/linux/src/common.cpp          |   59 -
 .../os/linux/src/common/concurrent_os.cpp       |  175 ++
 .../cpp/common/os/linux/src/common/utils.cpp    |  136 +
 .../cpp/common/os/linux/src/concurrent_os.cpp   |  175 --
 .../platforms/cpp/common/os/linux/src/utils.cpp |  484 ---
 .../os/win/include/ignite/common/common.h       |   20 +-
 .../win/include/ignite/common/concurrent_os.h   |    4 +-
 .../platforms/cpp/common/os/win/src/common.cpp  |   65 -
 .../common/os/win/src/common/concurrent_os.cpp  |  175 ++
 .../cpp/common/os/win/src/common/utils.cpp      |  143 +
 .../cpp/common/os/win/src/concurrent_os.cpp     |  175 --
 .../platforms/cpp/common/os/win/src/utils.cpp   |  500 ----
 .../cpp/common/project/vs/common.vcxproj        |   56 +-
 .../common/project/vs/common.vcxproj.filters    |   55 +-
 .../platforms/cpp/common/project/vs/module.def  |  132 -
 .../cpp/common/src/common/concurrent.cpp        |   94 +
 modules/platforms/cpp/common/src/concurrent.cpp |   94 -
 modules/platforms/cpp/common/src/date.cpp       |   83 +
 modules/platforms/cpp/common/src/exports.cpp    |  545 ----
 modules/platforms/cpp/common/src/guid.cpp       |   65 +
 .../platforms/cpp/common/src/ignite_error.cpp   |    7 +-
 modules/platforms/cpp/common/src/java.cpp       | 2779 -----------------
 modules/platforms/cpp/common/src/timestamp.cpp  |  117 +
 modules/platforms/cpp/configure.ac              |  108 +
 modules/platforms/cpp/configure.acrel           |   94 +
 modules/platforms/cpp/core-test/Makefile.am     |   62 +-
 modules/platforms/cpp/core-test/configure.ac    |   62 -
 .../platforms/cpp/core-test/include/Makefile.am |   10 +-
 .../cpp/core-test/project/vs/core-test.vcxproj  |   14 +-
 .../cpp/core-test/src/cache_query_test.cpp      |    2 +-
 modules/platforms/cpp/core/Makefile.am          |   59 +-
 modules/platforms/cpp/core/configure.ac         |   62 -
 modules/platforms/cpp/core/include/Makefile.am  |   50 +-
 .../cpp/core/include/ignite/cache/cache.h       |    8 +-
 .../cpp/core/include/ignite/cache/cache_entry.h |    6 +-
 .../core/include/ignite/cache/cache_peek_mode.h |    6 +-
 .../cpp/core/include/ignite/cache/query/query.h |    6 +-
 .../include/ignite/cache/query/query_argument.h |    6 +-
 .../include/ignite/cache/query/query_cursor.h   |    8 +-
 .../ignite/cache/query/query_fields_cursor.h    |    8 +-
 .../ignite/cache/query/query_fields_row.h       |    8 +-
 .../include/ignite/cache/query/query_scan.h     |    6 +-
 .../core/include/ignite/cache/query/query_sql.h |    6 +-
 .../ignite/cache/query/query_sql_fields.h       |    6 +-
 .../include/ignite/cache/query/query_text.h     |    6 +-
 .../platforms/cpp/core/include/ignite/ignite.h  |    6 +-
 .../core/include/ignite/ignite_configuration.h  |    6 +-
 .../cpp/core/include/ignite/ignition.h          |    4 +-
 .../impl/binary/binary_type_updater_impl.h      |   65 +
 .../core/include/ignite/impl/cache/cache_impl.h |    4 +-
 .../impl/cache/query/query_fields_row_impl.h    |    8 +-
 .../ignite/impl/cache/query/query_impl.h        |    8 +-
 .../core/include/ignite/impl/handle_registry.h  |    6 +-
 .../include/ignite/impl/ignite_environment.h    |  135 +
 .../cpp/core/include/ignite/impl/ignite_impl.h  |   22 +-
 .../impl/interop/interop_external_memory.h      |   54 +
 .../cpp/core/include/ignite/impl/operations.h   |    6 +-
 .../platforms/cpp/core/project/vs/core.vcxproj  |   17 +-
 .../cpp/core/project/vs/core.vcxproj.filters    |   24 +
 modules/platforms/cpp/core/src/ignite.cpp       |    2 +-
 modules/platforms/cpp/core/src/ignition.cpp     |   12 +-
 .../impl/binary/binary_type_updater_impl.cpp    |   99 +
 .../cpp/core/src/impl/cache/cache_impl.cpp      |    5 +-
 .../core/src/impl/cache/query/query_impl.cpp    |    3 +-
 .../cpp/core/src/impl/ignite_environment.cpp    |  186 ++
 .../platforms/cpp/core/src/impl/ignite_impl.cpp |    2 +-
 .../impl/interop/interop_external_memory.cpp    |   45 +
 modules/platforms/cpp/examples/Makefile.am      |   24 +
 modules/platforms/cpp/examples/README.txt       |   13 +-
 modules/platforms/cpp/examples/configure.ac     |   59 +
 .../platforms/cpp/examples/include/Makefile.am  |   24 +
 .../cpp/examples/odbc-example/Makefile.am       |   38 +-
 .../cpp/examples/odbc-example/configure.ac      |   38 -
 .../project/vs/odbc-example.vcxproj             |   12 +-
 .../cpp/examples/project/vs/ignite-examples.sln |    6 +-
 .../cpp/examples/putget-example/Makefile.am     |   37 +-
 .../cpp/examples/putget-example/configure.ac    |   55 -
 .../project/vs/putget-example.vcxproj           |   12 +-
 modules/platforms/cpp/ignite/Makefile.am        |   40 +-
 modules/platforms/cpp/ignite/configure.ac       |   62 -
 .../cpp/ignite/project/vs/ignite.vcxproj        |   26 +-
 modules/platforms/cpp/ignite/src/ignite.cpp     |   10 +-
 modules/platforms/cpp/jni/Makefile.am           |   62 +
 modules/platforms/cpp/jni/include/Makefile.am   |   25 +
 .../cpp/jni/include/ignite/jni/exports.h        |  182 ++
 .../platforms/cpp/jni/include/ignite/jni/java.h |  738 +++++
 .../cpp/jni/include/ignite/jni/utils.h          |  101 +
 .../platforms/cpp/jni/os/linux/src/utils.cpp    |  417 +++
 modules/platforms/cpp/jni/os/win/src/utils.cpp  |  423 +++
 modules/platforms/cpp/jni/project/README.TXT    |    1 +
 modules/platforms/cpp/jni/project/vs/README.TXT |    1 +
 .../platforms/cpp/jni/project/vs/jni.vcxproj    |  205 ++
 .../cpp/jni/project/vs/jni.vcxproj.filters      |   42 +
 modules/platforms/cpp/jni/project/vs/module.def |  132 +
 .../platforms/cpp/jni/project/vs/targetver.h    |   25 +
 modules/platforms/cpp/jni/src/exports.cpp       |  545 ++++
 modules/platforms/cpp/jni/src/java.cpp          | 2782 ++++++++++++++++++
 modules/platforms/cpp/odbc-test/Makefile.am     |   80 +-
 modules/platforms/cpp/odbc-test/configure.ac    |   62 -
 .../platforms/cpp/odbc-test/include/Makefile.am |   24 +
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   21 +-
 .../cpp/odbc-test/src/queries_test.cpp          |    2 +-
 modules/platforms/cpp/odbc/Makefile.am          |   96 +-
 modules/platforms/cpp/odbc/configure.ac         |   62 -
 modules/platforms/cpp/odbc/ignite-odbc.pc.in    |    9 -
 modules/platforms/cpp/odbc/include/Makefile.am  |   58 +
 .../platforms/cpp/odbc/include/ignite/odbc.h    |    4 +-
 .../ignite/odbc/app/application_data_buffer.h   |    6 +-
 .../odbc/include/ignite/odbc/app/parameter.h    |    6 +-
 .../cpp/odbc/include/ignite/odbc/column.h       |    6 +-
 .../cpp/odbc/include/ignite/odbc/common_types.h |    6 +-
 .../include/ignite/odbc/config/configuration.h  |    6 +-
 .../ignite/odbc/config/connection_info.h        |    6 +-
 .../cpp/odbc/include/ignite/odbc/connection.h   |    6 +-
 .../cpp/odbc/include/ignite/odbc/cursor.h       |    6 +-
 .../cpp/odbc/include/ignite/odbc/decimal.h      |    6 +-
 .../ignite/odbc/diagnostic/diagnosable.h        |    6 +-
 .../odbc/diagnostic/diagnosable_adapter.h       |    6 +-
 .../ignite/odbc/diagnostic/diagnostic_record.h  |    6 +-
 .../odbc/diagnostic/diagnostic_record_storage.h |    6 +-
 .../cpp/odbc/include/ignite/odbc/environment.h  |    6 +-
 .../cpp/odbc/include/ignite/odbc/message.h      |    6 +-
 .../odbc/include/ignite/odbc/meta/column_meta.h |    6 +-
 .../include/ignite/odbc/meta/primary_key_meta.h |    6 +-
 .../odbc/include/ignite/odbc/meta/table_meta.h  |    6 +-
 .../cpp/odbc/include/ignite/odbc/parser.h       |    6 +-
 .../ignite/odbc/query/column_metadata_query.h   |    6 +-
 .../odbc/include/ignite/odbc/query/data_query.h |    6 +-
 .../ignite/odbc/query/foreign_keys_query.h      |    6 +-
 .../ignite/odbc/query/primary_keys_query.h      |    6 +-
 .../cpp/odbc/include/ignite/odbc/query/query.h  |    6 +-
 .../ignite/odbc/query/special_columns_query.h   |    6 +-
 .../ignite/odbc/query/table_metadata_query.h    |    6 +-
 .../include/ignite/odbc/query/type_info_query.h |    6 +-
 .../cpp/odbc/include/ignite/odbc/result_page.h  |    6 +-
 .../cpp/odbc/include/ignite/odbc/row.h          |    6 +-
 .../cpp/odbc/include/ignite/odbc/statement.h    |    6 +-
 .../include/ignite/odbc/system/odbc_constants.h |    6 +-
 .../include/ignite/odbc/system/socket_client.h  |    6 +-
 .../cpp/odbc/include/ignite/odbc/type_traits.h  |    6 +-
 .../cpp/odbc/include/ignite/odbc/utility.h      |    8 +-
 .../platforms/cpp/odbc/project/vs/module.def    |    2 +-
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |   16 +-
 modules/platforms/cpp/odbc/src/decimal.cpp      |    2 +-
 modules/platforms/cpp/project/vs/ignite.sln     |   30 +-
 modules/platforms/cpp/project/vs/ignite.slnrel  |   34 +-
 .../platforms/cpp/project/vs/ignite_x86.slnrel  |   34 +-
 .../Apache.Ignite.Core.csproj                   |   29 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs      |    4 +-
 modules/platforms/dotnet/Apache.Ignite.sln      |   15 +-
 parent/pom.xml                                  |    3 +
 217 files changed, 9678 insertions(+), 9142 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/assembly/release-fabric-base.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric-base.xml b/assembly/release-fabric-base.xml
index 209634f..7b3d8cf 100644
--- a/assembly/release-fabric-base.xml
+++ b/assembly/release-fabric-base.xml
@@ -35,6 +35,18 @@
             <destName>ignite_x86.sln</destName>
         </file>
 
+        <file>
+            <source>modules/platforms/cpp/configure.acrel</source>
+            <outputDirectory>/platforms/cpp</outputDirectory>
+            <destName>configure.ac</destName>
+        </file>
+
+        <file>
+            <source>modules/platforms/cpp/Makefile.amrel</source>
+            <outputDirectory>/platforms/cpp</outputDirectory>
+            <destName>Makefile.am</destName>
+        </file>
+
         <!-- Other files. -->
         <file>
             <source>assembly/LICENSE_FABRIC</source>
@@ -114,6 +126,12 @@
             <outputDirectory>/platforms/cpp/common</outputDirectory>
         </fileSet>
 
+        <!-- Move CPP "jni" module. -->
+        <fileSet>
+            <directory>modules/platforms/cpp/jni</directory>
+            <outputDirectory>/platforms/cpp/jni</outputDirectory>
+        </fileSet>
+
         <!-- Move CPP "core" module. -->
         <fileSet>
             <directory>modules/platforms/cpp/core</directory>

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/DEVNOTES.txt b/modules/platforms/cpp/DEVNOTES.txt
index 8476930..2525ef3 100644
--- a/modules/platforms/cpp/DEVNOTES.txt
+++ b/modules/platforms/cpp/DEVNOTES.txt
@@ -18,64 +18,24 @@ Common Requirements:
    Apache Ignite has been tested with UnixODBC.
 
 Building the Apache Ignite C++ components:
+ * Navigate to the directory $IGNITE_HOME/platforms/cpp
+ * Configure build system using './configure' script. For additional options
+   use './configure --help'
+ * Build enabled components using 'make' command.
 
- * Build Apache Ignite C++ helper "common" library:
-     * Navigate to the directory $IGNITE_HOME/platforms/cpp/common
-     * Execute the following commands one by one:
-         * libtoolize
-         * aclocal
-         * autoheader
-         * automake --add-missing
-         * autoreconf
-         * ./configure
-         * make
-         * make install
- * Build Apache Ignite C++ "binary" library:
-     * Navigate to the directory $IGNITE_HOME/platforms/cpp/binary
-     * Execute the following commands one by one:
-         * libtoolize
-         * aclocal
-         * autoheader
-         * automake --add-missing
-         * autoreconf
-         * ./configure
-         * make
-         * make install
- * Build Apache Ignite C++ library:
-     * Navigate to the directory $IGNITE_HOME/platforms/cpp/core
-     * Execute the following commands one by one:
-         * libtoolize
-         * aclocal
-         * autoheader
-         * automake --add-missing
-         * autoreconf
-         * ./configure
-         * make
-         * make install
- * Build Apache Ignite C++ stand-alone node binary:
-     * Navigate to the directory $IGNITE_HOME/platforms/cpp/ignite
-     * Execute the following commands one by one:
-         * libtoolize
-         * aclocal
-         * autoheader
-         * automake --add-missing
-         * autoreconf
-         * ./configure
-         * make
- * Build Apache Ignite ODBC driver:
-     * Navigate to the directory $IGNITE_HOME/platforms/cpp/odbc
-     * Execute the following commands one by one:
-         * libtoolize
-         * aclocal
-         * autoheader
-         * automake --add-missing
-         * autoreconf
-         * ./configure
-         * make
-         * make install
+Or simply speaking do the following:
+ * cd $IGNITE_HOME/platforms/cpp
+ * ./configure
+ * make
 
-NOTE: "make install" command may require superuser privileges. In this case it must be
-executed as "sudo make install".
+Among standard included by autotools options configure script also include following
+Ignite-specific options:
+ * --enable-odbc - build included ODBC driver. Disabled by default.
+ * --enable-core - build Ignite core library. Enabled by default.
+ * --enable-node - build stand-alone node executable. Enabled by default.
+
+NOTE: You may want to use "make install" command to install Ignite libraries and heasders
+for your operation system. Note however that this action may require superuser privileges.
 
 Building on Windows with Visual Studio (tm)
 ----------------------------------
@@ -96,4 +56,4 @@ Building binaries:
 Building in later versions of Visual Studio:
  * Open project\vs\ignite.sln or project\vs\ignite_86.sln in Visual Studio
  * You will be prompted to "Update VC++ Compiler and Libraries", click "Update"
- * Build the solution.
\ No newline at end of file
+ * Build the solution.

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/Makefile.am b/modules/platforms/cpp/Makefile.am
new file mode 100644
index 0000000..5213d0c
--- /dev/null
+++ b/modules/platforms/cpp/Makefile.am
@@ -0,0 +1,58 @@
+##
+## 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.
+##
+
+ACLOCAL_AMFLAGS =-I m4
+
+if COND_ODBC
+  MAYBE_ODBC = odbc
+
+if COND_TESTS
+    MAYBE_ODBC_TESTS = odbc-test
+endif
+endif
+
+if COND_CORE
+  MAYBE_CORE = core
+
+if COND_TESTS
+    MAYBE_CORE_TESTS = core-test
+endif
+endif
+
+if COND_NODE
+  MAYBE_NODE = ignite
+endif
+
+SUBDIRS = \
+    common \
+    binary \
+    jni \
+    $(MAYBE_ODBC) \
+    $(MAYBE_CORE) \
+    $(MAYBE_NODE) \
+    $(MAYBE_ODBC_TESTS) \
+    $(MAYBE_CORE_TESTS)
+
+DIST_SUBDIRS = \
+    common \
+    binary \
+    jni \
+    odbc \
+    core \
+    ignite \
+    core-test \
+    odbc-test

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/Makefile.amrel
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/Makefile.amrel b/modules/platforms/cpp/Makefile.amrel
new file mode 100644
index 0000000..6172d06
--- /dev/null
+++ b/modules/platforms/cpp/Makefile.amrel
@@ -0,0 +1,46 @@
+##
+## 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.
+##
+
+ACLOCAL_AMFLAGS =-I m4
+
+if COND_ODBC
+  MAYBE_ODBC = odbc
+endif
+
+if COND_CORE
+  MAYBE_CORE = core
+endif
+
+if COND_NODE
+  MAYBE_NODE = ignite
+endif
+
+SUBDIRS = \
+    common \
+    binary \
+    jni \
+    $(MAYBE_ODBC) \
+    $(MAYBE_CORE) \
+    $(MAYBE_NODE)
+
+DIST_SUBDIRS = \
+    common \
+    binary \
+    jni \
+    odbc \
+    core \
+    ignite

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/README.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/README.txt b/modules/platforms/cpp/README.txt
index 17d1cf2..dbde9f0 100644
--- a/modules/platforms/cpp/README.txt
+++ b/modules/platforms/cpp/README.txt
@@ -57,18 +57,20 @@ Development:
  * Update Include Directories in Project Properties with paths to:
    * $(IGNITE_HOME)\platforms\cpp\common\include
    * $(IGNITE_HOME)\platforms\cpp\common\os\win\include
+   * $(IGNITE_HOME)\platforms\cpp\jni\include
+   * $(IGNITE_HOME)\platforms\cpp\jni\os\win\include
    * $(IGNITE_HOME)\platforms\cpp\binary\include
    * $(IGNITE_HOME)\platforms\cpp\core\include
-   * $(IGNITE_HOME)\platforms\cpp\core\os\win\include
    * $(JAVA_HOME)\include
    * $(JAVA_HOME)\include\win32
  * Update Library Directories with path to the built binaries
  * Update Linker\Input\Additional Dependencies in Project Properties with path to
    * ignite.common.lib
+   * ignite.jni.lib
    * ignite.binary.lib
    * ignite.core.lib
- * Make sure that your application is aware about ignite.common.dll and ignite.core.dll
+ * Make sure that your application is aware about ignite.jni.dll and ignite.core.dll
    libraries. The easiest way to achieve this is to either make sure these files are in
    %PATH%, or to put them into the output directory of your project with help of
    PostBuild events.
- * To start Apache Ignite as a standalone node or Windows service use ignite.exe
\ No newline at end of file
+ * To start Apache Ignite as a standalone node or Windows service use ignite.exe

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/Makefile.am b/modules/platforms/cpp/binary/Makefile.am
index f285bb5..4876776 100644
--- a/modules/platforms/cpp/binary/Makefile.am
+++ b/modules/platforms/cpp/binary/Makefile.am
@@ -15,45 +15,52 @@
 ## limitations under the License.
 ##
 
-ACLOCAL_AMFLAGS = "-Im4"
-
-SUBDIRS = . include
-DIST_SUBDIRS = . include
-
-AM_CPPFLAGS = -I$(srcdir)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL
-AM_CXXFLAGS = -Wall -std=c++0x
-LIB_LDFLAGS = -no-undefined -version-info 1
-
-COMMON_SRC = src/binary/binary_containers.cpp \
-             src/binary/binary_raw_writer.cpp \
-             src/binary/binary_writer.cpp \
-             src/binary/binary_reader.cpp \
-             src/binary/binary_type.cpp \
-             src/binary/binary_raw_reader.cpp \
-             src/impl/ignite_environment.cpp \
-             src/impl/binary/binary_type_manager.cpp \
-             src/impl/binary/binary_utils.cpp \
-             src/impl/binary/binary_type_updater_impl.cpp \
-             src/impl/binary/binary_reader_impl.cpp \
-             src/impl/binary/binary_type_handler.cpp \
-             src/impl/binary/binary_writer_impl.cpp \
-             src/impl/binary/binary_type_updater.cpp \
-             src/impl/binary/binary_schema.cpp \
-             src/impl/binary/binary_type_snapshot.cpp \
-             src/impl/interop/interop_memory.cpp \
-             src/impl/interop/interop_output_stream.cpp \
-             src/impl/interop/interop_input_stream.cpp \
-             src/guid.cpp \
-             src/date.cpp \
-             src/timestamp.cpp
+ACLOCAL_AMFLAGS =-I m4
 
 lib_LTLIBRARIES = libignite-binary.la
-libignite_binary_la_SOURCES = $(COMMON_SRC)
-libignite_binary_la_LIBADD = -L$(JAVA_HOME)/jre/lib/amd64/server
-libignite_binary_la_LDFLAGS = $(LIB_LDFLAGS) -L/usr/local/lib -lignite-common -ljvm -version-info 0:0:0 -release $(PACKAGE_VERSION)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ignite-binary.pc
+SUBDIRS = \
+    include
+
+AM_CPPFLAGS = \
+    -I$(srcdir)/include \
+    -I@top_srcdir@/common/include \
+    -I@top_srcdir@/common/os/linux/include \
+    -DIGNITE_IMPL
+
+AM_CXXFLAGS = \
+    -Wall \
+    -std=c++0x
+
+libignite_binary_la_LIBADD = \
+    @top_srcdir@/common/libignite-common.la
+
+libignite_binary_la_LDFLAGS = \
+    -no-undefined \
+    -version-info 0:0:0 \
+    -release $(PACKAGE_VERSION)
+
+libignite_binary_la_DEPENDENCIES = \
+    @top_srcdir@/common/libignite-common.la
+
+libignite_binary_la_SOURCES = \
+    src/binary/binary_containers.cpp \
+    src/binary/binary_raw_writer.cpp \
+    src/binary/binary_writer.cpp \
+    src/binary/binary_reader.cpp \
+    src/binary/binary_type.cpp \
+    src/binary/binary_raw_reader.cpp \
+    src/impl/binary/binary_type_manager.cpp \
+    src/impl/binary/binary_utils.cpp \
+    src/impl/binary/binary_reader_impl.cpp \
+    src/impl/binary/binary_type_handler.cpp \
+    src/impl/binary/binary_writer_impl.cpp \
+    src/impl/binary/binary_type_updater.cpp \
+    src/impl/binary/binary_schema.cpp \
+    src/impl/binary/binary_type_snapshot.cpp \
+    src/impl/interop/interop_memory.cpp \
+    src/impl/interop/interop_output_stream.cpp \
+    src/impl/interop/interop_input_stream.cpp
 
 clean-local:
 	$(RM) *.gcno *.gcda

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/configure.ac b/modules/platforms/cpp/binary/configure.ac
deleted file mode 100644
index 9b79e9a..0000000
--- a/modules/platforms/cpp/binary/configure.ac
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# 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.
-#
-
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([Apache Ignite Binary Protocol implementation for C++], [1.5.1.7927], [dev@ignite.apache.org], [ignite-binary], [ignite.apache.org])
-AC_CONFIG_SRCDIR(src)
-
-AC_CANONICAL_SYSTEM
-AC_CONFIG_MACRO_DIR([m4])
-AC_LANG([C++])
-
-# Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
-AC_CONFIG_HEADER(config.h)
-
-AM_PROG_AR
-
-# Checks for programs.
-GXX="-g -O2"
-
-AC_PROG_CXX
-
-# Initialize Libtool
-LT_INIT
-
-# Checks for libraries.
-AC_CHECK_LIB([pthread], [pthread_mutex_lock])
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-
-AC_CONFIG_FILES(Makefile include/Makefile ignite-binary.pc)
-
-AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/ignite-binary.pc.in
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/ignite-binary.pc.in b/modules/platforms/cpp/binary/ignite-binary.pc.in
deleted file mode 100644
index 14d3f34..0000000
--- a/modules/platforms/cpp/binary/ignite-binary.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: ignite-binary
-Description: Apache Ignite Binary Protocol implementation for C++.
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lignite-binary

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/Makefile.am b/modules/platforms/cpp/binary/include/Makefile.am
index 8415331..d3211a3 100644
--- a/modules/platforms/cpp/binary/include/Makefile.am
+++ b/modules/platforms/cpp/binary/include/Makefile.am
@@ -15,36 +15,32 @@
 ## limitations under the License.
 ##
 
-ACLOCAL_AMFLAGS = "-Im4"
+ACLOCAL_AMFLAGS =-I m4
 
-nobase_include_HEADERS = ignite/binary/binary_raw_reader.h \
-                         ignite/binary/binary_reader.h \
-                         ignite/binary/binary_writer.h \
-                         ignite/binary/binary_raw_writer.h \
-                         ignite/binary/binary_containers.h \
-                         ignite/binary/binary.h \
-                         ignite/binary/binary_consts.h \
-                         ignite/binary/binary_type.h \
-                         ignite/impl/binary/binary_type_handler.h \
-                         ignite/impl/binary/binary_id_resolver.h \
-                         ignite/impl/binary/binary_type_manager.h \
-                         ignite/impl/binary/binary_type_updater.h \
-                         ignite/impl/binary/binary_common.h \
-                         ignite/impl/binary/binary_type_updater_impl.h \
-                         ignite/impl/binary/binary_writer_impl.h \
-                         ignite/impl/binary/binary_type_snapshot.h \
-                         ignite/impl/binary/binary_reader_impl.h \
-                         ignite/impl/binary/binary_schema.h \
-                         ignite/impl/binary/binary_utils.h \
-                         ignite/impl/ignite_environment.h \
-                         ignite/impl/interop/interop_memory.h \
-                         ignite/impl/interop/interop.h \
-                         ignite/impl/interop/interop_stream_position_guard.h \
-                         ignite/impl/interop/interop_output_stream.h \
-                         ignite/impl/interop/interop_input_stream.h \
-                         ignite/guid.h \
-                         ignite/date.h \
-                         ignite/timestamp.h
+nobase_include_HEADERS = \
+    ignite/binary/binary_raw_reader.h \
+    ignite/binary/binary_reader.h \
+    ignite/binary/binary_writer.h \
+    ignite/binary/binary_raw_writer.h \
+    ignite/binary/binary_containers.h \
+    ignite/binary/binary.h \
+    ignite/binary/binary_consts.h \
+    ignite/binary/binary_type.h \
+    ignite/impl/binary/binary_type_handler.h \
+    ignite/impl/binary/binary_id_resolver.h \
+    ignite/impl/binary/binary_type_manager.h \
+    ignite/impl/binary/binary_type_updater.h \
+    ignite/impl/binary/binary_common.h \
+    ignite/impl/binary/binary_writer_impl.h \
+    ignite/impl/binary/binary_type_snapshot.h \
+    ignite/impl/binary/binary_reader_impl.h \
+    ignite/impl/binary/binary_schema.h \
+    ignite/impl/binary/binary_utils.h \
+    ignite/impl/interop/interop_memory.h \
+    ignite/impl/interop/interop.h \
+    ignite/impl/interop/interop_stream_position_guard.h \
+    ignite/impl/interop/interop_output_stream.h \
+    ignite/impl/interop/interop_input_stream.h
 
 uninstall-hook:
-	find ${includedir}/ignite -type d -empty -delete
+	if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d -empty -delete; fi

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary.h b/modules/platforms/cpp/binary/include/ignite/binary/binary.h
index 1ffa3e5..bfe23f4 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary.h
@@ -20,8 +20,8 @@
  * Includes all binary API headers.
  */
 
-#ifndef _IGNITE_BINARY
-#define _IGNITE_BINARY
+#ifndef _IGNITE_BINARY_BINARY
+#define _IGNITE_BINARY_BINARY
 
 #include "ignite/binary/binary_consts.h"
 #include "ignite/binary/binary_containers.h"
@@ -31,4 +31,4 @@
 #include "ignite/binary/binary_reader.h"
 #include "ignite/binary/binary_writer.h"
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_consts.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_consts.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_consts.h
index db7cc38..8f3245a 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_consts.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_consts.h
@@ -20,8 +20,8 @@
  * Declares specific binary constatants
  */
 
-#ifndef _IGNITE_BINARY_CONSTS
-#define _IGNITE_BINARY_CONSTS
+#ifndef _IGNITE_BINARY_BINARY_CONSTS
+#define _IGNITE_BINARY_BINARY_CONSTS
 
 #include <ignite/common/common.h>
 
@@ -83,4 +83,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY_CONSTS
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_containers.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_containers.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_containers.h
index 1659465..946101c 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_containers.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_containers.h
@@ -20,8 +20,8 @@
  * Declares binary reader and writer types for the collections.
  */
 
-#ifndef _IGNITE_BINARY_CONTAINERS
-#define _IGNITE_BINARY_CONTAINERS
+#ifndef _IGNITE_BINARY_BINARY_CONTAINERS
+#define _IGNITE_BINARY_BINARY_CONTAINERS
 
 #include <stdint.h>
 
@@ -261,7 +261,7 @@ namespace ignite
 
                 if (len != -1)
                 {
-                    common::utils::SafeArray<char> arr(len + 1);
+                    common::SafeArray<char> arr(len + 1);
 
                     GetNext(arr.target, len + 1);
 
@@ -528,4 +528,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY_CONTAINERS
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h
index 65271c5..473be3d 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_reader.h
@@ -20,8 +20,8 @@
  * Declares ignite::binary::BinaryRawReader class.
  */
 
-#ifndef _IGNITE_BINARY_RAW_READER
-#define _IGNITE_BINARY_RAW_READER
+#ifndef _IGNITE_BINARY_BINARY_RAW_READER
+#define _IGNITE_BINARY_BINARY_RAW_READER
 
 #include <stdint.h>
 #include <string>
@@ -285,7 +285,7 @@ namespace ignite
 
                 if (len != -1)
                 {
-                    ignite::common::utils::SafeArray<char> arr(len + 1);
+                    ignite::common::SafeArray<char> arr(len + 1);
 
                     ReadString(arr.target, len + 1);
 
@@ -392,4 +392,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY_RAW_READER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h
index b1267c9..41cfef7 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_raw_writer.h
@@ -20,8 +20,8 @@
  * Declares ignite::binary::BinaryRawWriter class.
  */
 
-#ifndef _IGNITE_BINARY_RAW_WRITER
-#define _IGNITE_BINARY_RAW_WRITER
+#ifndef _IGNITE_BINARY_BINARY_RAW_WRITER
+#define _IGNITE_BINARY_BINARY_RAW_WRITER
 
 #include <stdint.h>
 
@@ -360,4 +360,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY_RAW_WRITER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_reader.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_reader.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_reader.h
index fb15526..3e5bbb1 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_reader.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_reader.h
@@ -20,8 +20,8 @@
  * Declares ignite::binary::BinaryReader class.
  */
 
-#ifndef _IGNITE_BINARY_READER
-#define _IGNITE_BINARY_READER
+#ifndef _IGNITE_BINARY_BINARY_READER
+#define _IGNITE_BINARY_BINARY_READER
 
 #include <stdint.h>
 #include <string>
@@ -308,7 +308,7 @@ namespace ignite
 
                 if (len != -1)
                 {
-                    ignite::common::utils::SafeArray<char> arr(len + 1);
+                    ignite::common::SafeArray<char> arr(len + 1);
 
                     ReadString(fieldName, arr.target, len + 1);
 
@@ -430,4 +430,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY_READER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_type.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_type.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_type.h
index 422174e..978a928 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_type.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_type.h
@@ -21,14 +21,14 @@
  * to declare binary type specialisation for user types.
  */
 
-#ifndef _IGNITE_BINARY_TYPE
-#define _IGNITE_BINARY_TYPE
+#ifndef _IGNITE_BINARY_BINARY_TYPE
+#define _IGNITE_BINARY_BINARY_TYPE
 
 #include <stdint.h>
 
 #include <ignite/common/common.h>
 
-#include <ignite/common/ignite_error.h>
+#include <ignite/ignite_error.h>
 
 /**
  * @def IGNITE_BINARY_TYPE_START(T)
@@ -307,4 +307,4 @@ namespace ignite
     }
 }
 
-#endif
+#endif //_IGNITE_BINARY_BINARY_TYPE

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h b/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
index ed76c5b..1bee82a 100644
--- a/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
+++ b/modules/platforms/cpp/binary/include/ignite/binary/binary_writer.h
@@ -20,8 +20,8 @@
  * Declares ignite::binary::BinaryWriter class.
  */
 
-#ifndef _IGNITE_BINARY_WRITER
-#define _IGNITE_BINARY_WRITER
+#ifndef _IGNITE_BINARY_BINARY_WRITER
+#define _IGNITE_BINARY_BINARY_WRITER
 
 #include <string>
 #include <stdint.h>
@@ -398,4 +398,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_BINARY_BINARY_WRITER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/date.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/date.h b/modules/platforms/cpp/binary/include/ignite/date.h
deleted file mode 100644
index 31fe5d0..0000000
--- a/modules/platforms/cpp/binary/include/ignite/date.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * @file
- * Declares ignite::Date class.
- */
-
-#ifndef _IGNITE_DATE
-#define _IGNITE_DATE
-
-#include <stdint.h>
-
-#include <ignite/common/common.h>
-
-namespace ignite
-{
-    /**
-     * Date type.
-     */
-    class IGNITE_IMPORT_EXPORT Date
-    {
-    public:
-        /**
-         * Default constructor.
-         */
-        Date();
-
-        /**
-         * Copy constructor.
-         *
-         * @param another Another instance.
-         */
-        Date(const Date& another);
-
-        /**
-         * Constructor.
-         *
-         * @param ms Number of milliseconds since 00:00 hours, Jan 1, 1970 UTC.
-         */
-        Date(int64_t ms);
-
-        /**
-         * Copy operator.
-         *
-         * @param another Another instance.
-         * @return This.
-         */
-        Date& operator=(const Date& another);
-
-        /**
-         * Returns number of milliseconds since 00:00 hours, Jan 1, 1970 UTC.
-         *
-         * @return Number of milliseconds since 00:00 hours, Jan 1, 1970 UTC.
-         */
-        int64_t GetMilliseconds() const;
-
-        /**
-         * Returns number of seconds since 00:00 hours, Jan 1, 1970 UTC.
-         *
-         * @return Number of seconds since 00:00 hours, Jan 1, 1970 UTC.
-         */
-        int64_t GetSeconds() const;
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator==(const Date& val1, const Date& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if not equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator!=(const Date& val1, const Date& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if less.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator<(const Date& val1, const Date& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if less or equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator<=(const Date& val1, const Date& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if gretter.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator>(const Date& val1, const Date& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if gretter or equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator>=(const Date& val1, const Date& val2);
-    private:
-        /** Number of milliseconds since 00:00 hours, Jan 1, 1970 UTC. */
-        int64_t milliseconds;  
-    };
-}
-
-#endif //_IGNITE_DATE

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/guid.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/guid.h b/modules/platforms/cpp/binary/include/ignite/guid.h
deleted file mode 100644
index 9a045e6..0000000
--- a/modules/platforms/cpp/binary/include/ignite/guid.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * @file
- * Declares ignite::Guid class.
- */
-
-#ifndef _IGNITE_GUID
-#define _IGNITE_GUID
-
-#include <stdint.h>
-#include <iomanip>
-
-#include <ignite/common/common.h>
-
-namespace ignite
-{
-    /**
-     * Global universally unique identifier (GUID).
-     */
-    class IGNITE_IMPORT_EXPORT Guid
-    {
-    public:
-        /**
-         * Default constructor.
-         */
-        Guid();
-
-        /**
-         * Constructor.
-         *
-         * @param most Most significant bits.
-         * @param least Least significant bits.
-         */
-        Guid(int64_t most, int64_t least);
-
-        /**
-         * Returns the most significant 64 bits of this instance.
-         *
-         * @return The most significant 64 bits of this instance.
-         */
-        int64_t GetMostSignificantBits() const;
-
-        /**
-         * Returns the least significant 64 bits of this instance.
-         *  
-         * @return The least significant 64 bits of this instance.
-         */
-        int64_t GetLeastSignificantBits() const;
-
-        /**
-         * The version number associated with this instance.  The version
-         * number describes how this Guid was generated.
-         *
-         * The version number has the following meaning:
-         * 1    Time-based UUID;
-         * 2    DCE security UUID;
-         * 3    Name-based UUID;
-         * 4    Randomly generated UUID.
-         *
-         * @return The version number of this instance.
-         */
-        int32_t GetVersion() const;
-
-        /**
-         * The variant number associated with this instance. The variant
-         * number describes the layout of the Guid.
-         *
-         * The variant number has the following meaning:
-         * 0    Reserved for NCS backward compatibility;
-         * 2    IETF RFC 4122 (Leach-Salz), used by this class;
-         * 6    Reserved, Microsoft Corporation backward compatibility;
-         * 7    Reserved for future definition.
-         *
-         * @return The variant number of this instance.
-         */
-        int32_t GetVariant() const;
-
-        /**
-         * Get hash code of this instance (used in serialization).
-         *
-         * @return Hash code.
-         */
-        int32_t GetHashCode() const;
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator== (const Guid& val1, const Guid& val2);
-    private:
-        /** Most significant bits. */
-        int64_t most;  
-
-        /** Least significant bits. */
-        int64_t least; 
-    };
-
-    /**
-     * Output operator.
-     *
-     * @param os Output stream.
-     * @param guid Guid to output.
-     * @return Reference to the first param.
-     */
-    template<typename C>
-    std::basic_ostream<C>& operator<<(std::basic_ostream<C>& os, const Guid& guid)
-    {
-        uint32_t part1 = static_cast<uint32_t>(guid.GetMostSignificantBits() >> 32);
-        uint16_t part2 = static_cast<uint16_t>(guid.GetMostSignificantBits() >> 16);
-        uint16_t part3 = static_cast<uint16_t>(guid.GetMostSignificantBits());
-        uint16_t part4 = static_cast<uint16_t>(guid.GetLeastSignificantBits() >> 48);
-        uint64_t part5 = guid.GetLeastSignificantBits() & 0x0000FFFFFFFFFFFFULL;
-
-        os  << std::setfill<C>('0') << std::setw(8)  << std::hex << part1 << '-'
-            << std::setfill<C>('0') << std::setw(4)  << std::hex << part2 << '-'
-            << std::setfill<C>('0') << std::setw(4)  << std::hex << part3 << '-'
-            << std::setfill<C>('0') << std::setw(4)  << std::hex << part4 << '-'
-            << std::setfill<C>('0') << std::setw(12) << std::hex << part5;
-
-        return os;
-    }
-
-    /**
-     * Input operator.
-     *
-     * @param is Input stream.
-     * @param guid Guid to input.
-     * @return Reference to the first param.
-     */
-    template<typename C>
-    std::basic_istream<C>& operator>>(std::basic_istream<C>& is, Guid& guid)
-    {
-        uint64_t parts[5];
-
-        C delim;
-
-        for (int i = 0; i < 4; ++i)
-        {
-            is >> std::hex >> parts[i] >> delim;
-
-            if (delim != static_cast<C>('-'))
-                return is;
-        }
-
-        is >> std::hex >> parts[4];
-
-        guid = Guid((parts[0] << 32) | (parts[1] << 16) | parts[2], (parts[3] << 48) | parts[4]);
-
-        return is;
-    }
-}
-
-#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_common.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_common.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_common.h
index fe0d878..462bc5b 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_common.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_common.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_COMMON
-#define _IGNITE_IMPL_BINARY_COMMON
+#ifndef _IGNITE_IMPL_BINARY_BINARY_COMMON
+#define _IGNITE_IMPL_BINARY_BINARY_COMMON
 
 #include <stdint.h>
 
@@ -191,4 +191,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_COMMON
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_id_resolver.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_id_resolver.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_id_resolver.h
index b5f31e9..bbbf239 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_id_resolver.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_id_resolver.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_ID_RESOLVER
-#define _IGNITE_IMPL_BINARY_ID_RESOLVER
+#ifndef _IGNITE_IMPL_BINARY_BINARY_ID_RESOLVER
+#define _IGNITE_IMPL_BINARY_BINARY_ID_RESOLVER
 
 #include "ignite/binary/binary_type.h"
 
@@ -103,4 +103,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_ID_RESOLVER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
index cf36204..426e44f 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_reader_impl.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_READER
-#define _IGNITE_IMPL_BINARY_READER
+#ifndef _IGNITE_IMPL_BINARY_BINARY_READER
+#define _IGNITE_IMPL_BINARY_BINARY_READER
 
 #include <stdint.h>
 
@@ -1397,7 +1397,7 @@ namespace ignite
                 {
                     int32_t realLen = stream->ReadInt32();
 
-                    ignite::common::utils::SafeArray<char> arr(realLen + 1);
+                    ignite::common::SafeArray<char> arr(realLen + 1);
 
                     for (int i = 0; i < realLen; i++)
                         *(arr.target + i) = static_cast<char>(stream->ReadInt8());
@@ -1419,4 +1419,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_READER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_schema.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_schema.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_schema.h
index b100b8c..756a3f7 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_schema.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_schema.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_SCHEMA
-#define _IGNITE_IMPL_BINARY_SCHEMA
+#ifndef _IGNITE_IMPL_BINARY_BINARY_SCHEMA
+#define _IGNITE_IMPL_BINARY_BINARY_SCHEMA
 
 #include <vector>
 #include <stdint.h>
@@ -133,4 +133,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_SCHEMA
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_handler.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_handler.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_handler.h
index ba684c2..d06e5d4 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_handler.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_handler.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_TYPE_HANDLER
-#define _IGNITE_IMPL_BINARY_TYPE_HANDLER
+#ifndef _IGNITE_IMPL_BINARY_BINARY_TYPE_HANDLER
+#define _IGNITE_IMPL_BINARY_BINARY_TYPE_HANDLER
 
 #include <ignite/common/concurrent.h>
 
@@ -99,4 +99,4 @@ namespace ignite
     }    
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_TYPE_HANDLER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_manager.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_manager.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_manager.h
index 0892042..6019a2c 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_manager.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_manager.h
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_TYPE_MANAGER
-#define _IGNITE_IMPL_BINARY_TYPE_MANAGER
+#ifndef _IGNITE_IMPL_BINARY_BINARY_TYPE_MANAGER
+#define _IGNITE_IMPL_BINARY_BINARY_TYPE_MANAGER
 
 #include <vector>
 
-#include <ignite/common/ignite_error.h>
+#include <ignite/ignite_error.h>
 #include "ignite/impl/binary/binary_type_handler.h"
 #include "ignite/impl/binary/binary_type_updater.h"
 
@@ -117,4 +117,4 @@ namespace ignite
     }    
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_TYPE_MANAGER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_snapshot.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_snapshot.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_snapshot.h
index 30055cc..4a8b41f 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_snapshot.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_snapshot.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_TYPE_SNAPSHOT
-#define _IGNITE_IMPL_BINARY_TYPE_SNAPSHOT
+#ifndef _IGNITE_IMPL_BINARY_BINARY_TYPE_SNAPSHOT
+#define _IGNITE_IMPL_BINARY_BINARY_TYPE_SNAPSHOT
 
 #include <map>
 #include <set>
@@ -119,4 +119,4 @@ namespace ignite
     }    
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_TYPE_SNAPSHOT
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater.h
index be9e1cc..5bd1d7e 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater.h
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_TYPE_UPDATER
-#define _IGNITE_IMPL_BINARY_TYPE_UPDATER
+#ifndef _IGNITE_IMPL_BINARY_BINARY_TYPE_UPDATER
+#define _IGNITE_IMPL_BINARY_BINARY_TYPE_UPDATER
 
-#include <ignite/common/ignite_error.h>
+#include <ignite/ignite_error.h>
 #include "ignite/impl/binary/binary_type_snapshot.h"
 
 namespace ignite
@@ -50,4 +50,4 @@ namespace ignite
     }    
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_TYPE_UPDATER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater_impl.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater_impl.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater_impl.h
deleted file mode 100644
index a0e4a7b..0000000
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_type_updater_impl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef _IGNITE_IMPL_BINARY_TYPE_UPDATER_IMPL
-#define _IGNITE_IMPL_BINARY_TYPE_UPDATER_IMPL
-
-#include <ignite/common/exports.h>
-
-#include "ignite/impl/ignite_environment.h"
-#include "ignite/impl/binary/binary_type_updater.h"
-
-namespace ignite
-{    
-    namespace impl
-    {
-        namespace binary
-        {
-            /**
-             * Type updater implementation.
-             */
-            class IGNITE_IMPORT_EXPORT BinaryTypeUpdaterImpl : public BinaryTypeUpdater
-            {
-            public:
-                /**
-                 * Constructor.
-                 *
-                 * @param env Environment.
-                 * @param javaRef Reference to Java object which is able to process type request.
-                 */
-                BinaryTypeUpdaterImpl(ignite::common::concurrent::SharedPointer<IgniteEnvironment> env, jobject javaRef);
-
-                /**
-                 * Destructor.
-                 */
-                ~BinaryTypeUpdaterImpl();
-
-                bool Update(Snap* snapshot, IgniteError* err);
-            private:
-                /** Environment. */
-                ignite::common::concurrent::SharedPointer<IgniteEnvironment> env;
-                
-                /** Handle to Java object. */
-                jobject javaRef;                 
-
-                IGNITE_NO_COPY_ASSIGNMENT(BinaryTypeUpdaterImpl)
-            };
-        }
-    }    
-}
-
-#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_utils.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_utils.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_utils.h
index 403d534..88130d8 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_utils.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_utils.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_UTILS
-#define _IGNITE_IMPL_BINARY_UTILS
+#ifndef _IGNITE_IMPL_BINARY_BINARY_UTILS
+#define _IGNITE_IMPL_BINARY_BINARY_UTILS
 
 #include <stdint.h>
 
@@ -406,7 +406,7 @@ namespace ignite
                 {
                     time_t tmt = DateToCTime(date);
 
-                    return common::utils::IgniteGmTime(tmt, ctime);
+                    return common::IgniteGmTime(tmt, ctime);
                 }
 
                 /**
@@ -420,7 +420,7 @@ namespace ignite
                 {
                     time_t tmt = TimestampToCTime(ts);
 
-                    return common::utils::IgniteGmTime(tmt, ctime);
+                    return common::IgniteGmTime(tmt, ctime);
                 }
 
                 /**
@@ -454,7 +454,7 @@ namespace ignite
                  */
                 static inline Date CTmToDate(const tm& ctime)
                 {
-                    time_t time = common::utils::IgniteTimeGm(ctime);
+                    time_t time = common::IgniteTimeGm(ctime);
 
                     return CTimeToDate(time);
                 }
@@ -468,7 +468,7 @@ namespace ignite
                  */
                 static inline Timestamp CTmToTimestamp(const tm& ctime, int32_t ns)
                 {
-                    time_t time = common::utils::IgniteTimeGm(ctime);
+                    time_t time = common::IgniteTimeGm(ctime);
 
                     return CTimeToTimestamp(time, ns);
                 }
@@ -543,4 +543,4 @@ namespace ignite
     }
 }
 
-#endif
+#endif //_IGNITE_IMPL_BINARY_BINARY_UTILS

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_writer_impl.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_writer_impl.h b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_writer_impl.h
index a490374..fda507f 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_writer_impl.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/binary/binary_writer_impl.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_BINARY_WRITER
-#define _IGNITE_IMPL_BINARY_WRITER
+#ifndef _IGNITE_IMPL_BINARY_BINARY_WRITER
+#define _IGNITE_IMPL_BINARY_BINARY_WRITER
 
 #include <cstring>
 #include <string>
@@ -982,4 +982,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_BINARY_BINARY_WRITER
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/ignite_environment.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/ignite_environment.h b/modules/platforms/cpp/binary/include/ignite/impl/ignite_environment.h
deleted file mode 100644
index 02facfc..0000000
--- a/modules/platforms/cpp/binary/include/ignite/impl/ignite_environment.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef _IGNITE_ENVIRONMENT
-#define _IGNITE_ENVIRONMENT
-
-#include <ignite/common/concurrent.h>
-#include <ignite/common/java.h>
-
-#include "ignite/impl/interop/interop_memory.h"
-#include "binary/binary_type_manager.h"
-
-namespace ignite 
-{
-    namespace impl 
-    {
-        /**
-         * Defines environment in which Ignite operates.
-         */
-        class IGNITE_IMPORT_EXPORT IgniteEnvironment
-        {
-        public:
-            /**
-             * Default memory block allocation size.
-             */
-            enum { DEFAULT_ALLOCATION_SIZE = 1024 };
-
-            /**
-             * Default constructor.
-             */
-            IgniteEnvironment();
-
-            /**
-             * Destructor.
-             */
-            ~IgniteEnvironment();
-
-            /**
-             * Populate callback handlers.
-             *
-             * @param Target (current env wrapped into a shared pointer).
-             * @return JNI handlers.
-             */
-            ignite::common::java::JniHandlers GetJniHandlers(ignite::common::concurrent::SharedPointer<IgniteEnvironment>* target);
-
-            /**
-             * Perform initialization on successful start.
-             *
-             * @param ctx Context.
-             */
-            void Initialize(ignite::common::concurrent::SharedPointer<ignite::common::java::JniContext> ctx);
-
-            /**
-             * Start callback.
-             *
-             * @param memPtr Memory pointer.
-             */
-            void OnStartCallback(long long memPtr);
-
-            /**
-             * Get name of Ignite instance.
-             *
-             * @return Name.
-             */
-            const char* InstanceName() const;
-
-            /**
-             * Get JNI context.
-             *
-             * @return Context.
-             */
-            ignite::common::java::JniContext* Context();
-
-            /**
-             * Get memory for interop operations.
-             *
-             * @return Memory.
-             */
-            ignite::common::concurrent::SharedPointer<interop::InteropMemory> AllocateMemory();
-
-            /**
-             * Get memory chunk for interop operations with desired capacity.
-             *
-             * @param cap Capacity.
-             * @return Memory.
-             */
-            ignite::common::concurrent::SharedPointer<interop::InteropMemory> AllocateMemory(int32_t cap);
-
-            /**
-             * Get memory chunk located at the given pointer.
-             *
-             * @param memPtr Memory pointer.
-             * @retrun Memory.
-             */
-            ignite::common::concurrent::SharedPointer<interop::InteropMemory> GetMemory(int64_t memPtr);
-
-            /**
-             * Get type manager.
-             *
-             * @param Type manager.
-             */
-            binary::BinaryTypeManager* GetTypeManager();
-        private:
-            /** Context to access Java. */
-            ignite::common::concurrent::SharedPointer<ignite::common::java::JniContext> ctx;
-
-            /** Startup latch. */
-            ignite::common::concurrent::SingleLatch* latch;
-
-            /** Ignite name. */
-            char* name;
-
-            /** Type manager. */
-            binary::BinaryTypeManager* metaMgr;
-
-            IGNITE_NO_COPY_ASSIGNMENT(IgniteEnvironment);
-        };
-    }
-}
-
-#endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
index da4fdb9..9f0d89e 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_INTEROP
-#define _IGNITE_IMPL_INTEROP
+#ifndef _IGNITE_IMPL_INTEROP_INTEROP
+#define _IGNITE_IMPL_INTEROP_INTEROP
 
 #include "ignite/impl/interop/interop_memory.h"
 #include "ignite/impl/interop/interop_output_stream.h"
 #include "ignite/impl/interop/interop_input_stream.h"
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_INTEROP_INTEROP
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_input_stream.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_input_stream.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_input_stream.h
index 6842990..3652516 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_input_stream.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_input_stream.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_INTEROP_INPUT_STREAM
-#define _IGNITE_IMPL_INTEROP_INPUT_STREAM
+#ifndef _IGNITE_IMPL_INTEROP_INTEROP_INPUT_STREAM
+#define _IGNITE_IMPL_INTEROP_INTEROP_INPUT_STREAM
 
 #include "ignite/impl/interop/interop_memory.h"
 
@@ -247,4 +247,4 @@ namespace ignite
     }    
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_INTEROP_INTEROP_INPUT_STREAM
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_memory.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_memory.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_memory.h
index 389a3ef..50b5328 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_memory.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_memory.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_INTEROP_MEMORY
-#define _IGNITE_IMPL_INTEROP_MEMORY
+#ifndef _IGNITE_IMPL_INTEROP_INTEROP_MEMORY
+#define _IGNITE_IMPL_INTEROP_INTEROP_MEMORY
 
 #include <stdint.h>
 
@@ -262,26 +262,8 @@ namespace ignite
 
                 IGNITE_NO_COPY_ASSIGNMENT(InteropUnpooledMemory)
             };
-
-            /**
-             * Interop external memory.
-             */
-            class IGNITE_IMPORT_EXPORT InteropExternalMemory : public InteropMemory
-            {
-            public:
-                /**
-                 * Constructor.
-                 *
-                 * @param memPtr External memory pointer.
-                 */
-                explicit InteropExternalMemory(int8_t* memPtr);
-
-                virtual void Reallocate(int32_t cap);
-            private:
-                IGNITE_NO_COPY_ASSIGNMENT(InteropExternalMemory)
-            };
         }
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_INTEROP_INTEROP_MEMORY
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_output_stream.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_output_stream.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_output_stream.h
index 0814c01..c5bb884 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_output_stream.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_output_stream.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_INTEROP_OUTPUT_STREAM
-#define _IGNITE_IMPL_INTEROP_OUTPUT_STREAM
+#ifndef _IGNITE_IMPL_INTEROP_INTEROP_OUTPUT_STREAM
+#define _IGNITE_IMPL_INTEROP_INTEROP_OUTPUT_STREAM
 
 #include "ignite/impl/interop/interop_memory.h"
 
@@ -247,4 +247,4 @@ namespace ignite
     }
 }
 
-#endif
\ No newline at end of file
+#endif //_IGNITE_IMPL_INTEROP_INTEROP_OUTPUT_STREAM
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
index 0e0cbc89..69124e0 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#ifndef _IGNITE_IMPL_INTEROP_STREAM_POSITION_GUARD
-#define _IGNITE_IMPL_INTEROP_OUTPUT_POSITION_GUARD
+#ifndef _IGNITE_IMPL_INTEROP_INTEROP_STREAM_POSITION_GUARD
+#define _IGNITE_IMPL_INTEROP_INTEROP_STREAM_POSITION_GUARD
 
 #include "ignite/impl/interop/interop_memory.h"
 
@@ -76,4 +76,4 @@ namespace ignite
     }
 }
 
-#endif
+#endif //_IGNITE_IMPL_INTEROP_INTEROP_STREAM_POSITION_GUARD

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cca0be5/modules/platforms/cpp/binary/include/ignite/timestamp.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/timestamp.h b/modules/platforms/cpp/binary/include/ignite/timestamp.h
deleted file mode 100644
index 4528e53..0000000
--- a/modules/platforms/cpp/binary/include/ignite/timestamp.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * @file
- * Declares ignite::Timestamp class.
- */
-
-#ifndef _IGNITE_TIMESTAMP
-#define _IGNITE_TIMESTAMP
-
-#include <stdint.h>
-
-#include <ignite/common/common.h>
-
-#include <ignite/date.h>
-
-namespace ignite
-{
-    /**
-     * Timestamp type.
-     */
-    class IGNITE_IMPORT_EXPORT Timestamp
-    {
-    public:
-        /**
-         * Default constructor.
-         */
-        Timestamp();
-
-        /**
-         * Copy constructor.
-         *
-         * @param another Another instance.
-         */
-        Timestamp(const Timestamp& another);
-
-        /**
-         * Constructor.
-         *
-         * @param ms Number of milliseconds since 00:00 hours, Jan 1, 1970 UTC.
-         */
-        Timestamp(int64_t ms);
-
-        /**
-         * Constructor.
-         *
-         * @param seconds Number of seconds since 00:00 hours, Jan 1, 1970 UTC.
-         * @param fractionNs Fractional second component in nanoseconds.
-         *     Must be in range [0..999999999].
-         */
-        Timestamp(int64_t seconds, int32_t fractionNs);
-
-        /**
-         * Copy operator.
-         *
-         * @param another Another instance.
-         * @return This.
-         */
-        Timestamp& operator=(const Timestamp& another);
-
-        /**
-         * Returns number of milliseconds since 00:00 hours, Jan 1, 1970 UTC.
-         *
-         * @return Number of milliseconds since 00:00 hours, Jan 1, 1970 UTC.
-         */
-        int64_t GetMilliseconds() const;
-
-        /**
-         * Returns number of seconds since 00:00 hours, Jan 1, 1970 UTC.
-         *
-         * @return Number of seconds since 00:00 hours, Jan 1, 1970 UTC.
-         */
-        int64_t GetSeconds() const;
-
-        /**
-         * Returns number of nanoseconds - fractional seconds component.
-         *
-         * @return Fractional second component expressed in nanoseconds.
-         */
-        int32_t GetSecondFraction() const;
-
-        /**
-         * Returns corresponding date.
-         *
-         * @return Corresponding date.
-         */
-        Date GetDate() const;
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator==(const Timestamp& val1, const Timestamp& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if not equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator!=(const Timestamp& val1, const Timestamp& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if less.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator<(const Timestamp& val1, const Timestamp& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if less or equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator<=(const Timestamp& val1, const Timestamp& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if gretter.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator>(const Timestamp& val1, const Timestamp& val2);
-
-        /**
-         * Comparison operator override.
-         *
-         * @param val1 First value.
-         * @param val2 Second value.
-         * @return True if gretter or equal.
-         */
-        friend bool IGNITE_IMPORT_EXPORT operator>=(const Timestamp& val1, const Timestamp& val2);
-    private:
-        /** Number of seconds since 00:00 hours, Jan 1, 1970 UTC. */
-        int64_t seconds;
-
-        /** Fractional second component in nanoseconds. */
-        int32_t fractionNs;
-    };
-}
-
-#endif //_IGNITE_TIMESTAMP


Mime
View raw message