From eaaf17ff21d94422df4d27c5b6f07203a442d7b5 Mon Sep 17 00:00:00 2001
From: Sasha Didukh <sasha.didukh@gmail.com>
Date: Thu, 10 Mar 2016 13:24:23 +0200
Subject: [PATCH 01/42] APP-56: Remove notifications count restrictions.

---
 notificationdemo/source/c/src/kaa_demo.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/notificationdemo/source/c/src/kaa_demo.c b/notificationdemo/source/c/src/kaa_demo.c
index 19043c731..55951eb33 100755
--- a/notificationdemo/source/c/src/kaa_demo.c
+++ b/notificationdemo/source/c/src/kaa_demo.c
@@ -44,14 +44,10 @@ static kaa_client_t *kaa_client = NULL;
 void on_notification(void *context, uint64_t *topic_id, kaa_notification_t *notification)
 {
     KAA_DEMO_UNUSED(context);
-    static short notifications_received = 2;
     if (notification->message->type == KAA_NOTIFICATION_UNION_STRING_OR_NULL_BRANCH_0) {
         kaa_string_t *message = (kaa_string_t *)notification->message->data;
         printf("Notification for topic id '%llu' received\n", *topic_id);
         printf("Notification body: %s\n", message->data);
-        if (!--notifications_received) {
-            kaa_client_stop(kaa_client);
-        }
     } else {
         printf("Error:Received notification's body is null\n");
     }

From 2999add990443337538428d4590c7168cd0e3a9e Mon Sep 17 00:00:00 2001
From: RostakaGmfun <rostawesomegd@gmail.com>
Date: Tue, 15 Mar 2016 16:02:34 +0200
Subject: [PATCH 02/42] APP-58: Syntax errors in GPIO demo

---
 gpiocontrol/source/cc32xx/build.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gpiocontrol/source/cc32xx/build.sh b/gpiocontrol/source/cc32xx/build.sh
index 53aac1ffe..7414e0c57 100755
--- a/gpiocontrol/source/cc32xx/build.sh
+++ b/gpiocontrol/source/cc32xx/build.sh
@@ -108,15 +108,10 @@ function clean {
 }
 
 function run {
-    cd "$PROJECT_HOME/$BUILD_DIR"
-    ./$APP_NAME
+    echo "To run demo, please have a look at http://docs.kaaproject.org/display/KAA/Texas+Instruments+CC3200#TexasInstrumentsCC3200-Example"
 }
 
-#for cmd in $@
-#do
-cmd=$1
-
-case "$cmd" in
+case "$1" in
     build)
         build_thirdparty &&
         build_app
@@ -141,5 +136,3 @@ case "$cmd" in
         help
     ;;
 esac
-
-done

From aa61d37079ae41c148821cacc16657b6494e0eba Mon Sep 17 00:00:00 2001
From: AlexeyGamov <agamov@cybervisiontech.com>
Date: Wed, 16 Mar 2016 19:18:52 +0200
Subject: [PATCH 03/42] APP-60: Fix wildcards

---
 cassandrademo/source/c/build.sh              | 2 +-
 configurationdemo/source/cpp/build.bat       | 4 ++--
 connectedcar/source/c/deploy.sh              | 2 +-
 datacollectiondemo/source/cpp/build.bat      | 4 ++--
 econais/ec19d/streetlight-driver/deploy.sh   | 6 ++----
 econais/ec19d/trafficlights-driver/deploy.sh | 6 ++----
 eventdemo/source/cpp/build.bat               | 4 ++--
 notificationdemo/source/cpp/build.bat        | 2 +-
 sparkdemo/source/cpp/build.bat               | 2 +-
 sparkdemo/source/cpp/build.sh                | 2 +-
 stormdemo/source/c/build.bat                 | 4 ++--
 stormdemo/source/c/build.sh                  | 2 +-
 stormdemo/source/cpp/build.bat               | 4 ++--
 stormdemo/source/cpp/build.sh                | 2 +-
 vehicletelemetry/source/cpp/build.bat        | 4 ++--
 15 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/cassandrademo/source/c/build.sh b/cassandrademo/source/c/build.sh
index a302c1479..73e91cfa7 100755
--- a/cassandrademo/source/c/build.sh
+++ b/cassandrademo/source/c/build.sh
@@ -35,7 +35,7 @@ LIBS_PATH="libs"
 KAA_LIB_PATH="$LIBS_PATH/kaa"
 KAA_C_LIB_HEADER_PATH="$KAA_LIB_PATH/src"
 KAA_CPP_LIB_HEADER_PATH="$KAA_LIB_PATH/kaa"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 
 function build_thirdparty {
     if [[ ! -d "$KAA_C_LIB_HEADER_PATH" &&  ! -d "$KAA_CPP_LIB_HEADER_PATH" ]]
diff --git a/configurationdemo/source/cpp/build.bat b/configurationdemo/source/cpp/build.bat
index 5129a920f..6d478e70a 100755
--- a/configurationdemo/source/cpp/build.bat
+++ b/configurationdemo/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
@@ -128,4 +128,4 @@ goto :eof
 echo "Choose one of the following: {build|run|deploy|clean}"
 goto :eof
 
-endlocal
\ No newline at end of file
+endlocal
diff --git a/connectedcar/source/c/deploy.sh b/connectedcar/source/c/deploy.sh
index e899a53eb..7bab188a2 100755
--- a/connectedcar/source/c/deploy.sh
+++ b/connectedcar/source/c/deploy.sh
@@ -27,7 +27,7 @@ LIBS_PATH="libs"
 KAA_LIB_PATH="$LIBS_PATH/kaa"
 KAA_C_LIB_HEADER_PATH="$KAA_LIB_PATH/src"
 KAA_CPP_LIB_HEADER_PATH="$KAA_LIB_PATH/kaa"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 
 function renameOld {
     mv "$MAPPLE_HOME_VAR/$MAIN_SOURCE_NAME" "$MAPPLE_HOME_VAR/$MAIN_SOURCE_NAME.$PREV_SUFFIX"
diff --git a/datacollectiondemo/source/cpp/build.bat b/datacollectiondemo/source/cpp/build.bat
index 15d23eb08..b6b289264 100755
--- a/datacollectiondemo/source/cpp/build.bat
+++ b/datacollectiondemo/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
@@ -128,4 +128,4 @@ goto :eof
 echo "Choose one of the following: {build|run|deploy|clean}"
 goto :eof
 
-endlocal
\ No newline at end of file
+endlocal
diff --git a/econais/ec19d/streetlight-driver/deploy.sh b/econais/ec19d/streetlight-driver/deploy.sh
index d48258aa1..372f388ec 100755
--- a/econais/ec19d/streetlight-driver/deploy.sh
+++ b/econais/ec19d/streetlight-driver/deploy.sh
@@ -18,13 +18,13 @@
 
 KAA_LIB_PATH="libs/kaa"
 KAA_C_SOURCES_PATH="$KAA_LIB_PATH/src"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 
 
 function unpackSources {
     if [[ ! -d "$KAA_C_SOURCES_PATH" ]]
     then
-        cd $KAA_LIB_PATH && 
+        cd $KAA_LIB_PATH &&
         KAA_SDK_TAR_NAME=$(find $PROJECT_HOME -iname $KAA_SDK_TAR)
 
         if [ -z "$KAA_SDK_TAR_NAME" ]
@@ -38,7 +38,6 @@ function unpackSources {
 }
 
 function copySources {
-    
     current_folder_name=${PWD##*/}
     if [ ! -d "$ECONAIS_HOME_VAR/applications" ]
     then
@@ -48,7 +47,6 @@ function copySources {
     mkdir -p "$ECONAIS_HOME_VAR/applications/$current_folder_name"
     cp -r ./src "$ECONAIS_HOME_VAR/applications/$current_folder_name"
     cp -r ./cfg "$ECONAIS_HOME_VAR/applications/$current_folder_name"
-    
 }
 
 function generateKey {
diff --git a/econais/ec19d/trafficlights-driver/deploy.sh b/econais/ec19d/trafficlights-driver/deploy.sh
index d48258aa1..372f388ec 100755
--- a/econais/ec19d/trafficlights-driver/deploy.sh
+++ b/econais/ec19d/trafficlights-driver/deploy.sh
@@ -18,13 +18,13 @@
 
 KAA_LIB_PATH="libs/kaa"
 KAA_C_SOURCES_PATH="$KAA_LIB_PATH/src"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 
 
 function unpackSources {
     if [[ ! -d "$KAA_C_SOURCES_PATH" ]]
     then
-        cd $KAA_LIB_PATH && 
+        cd $KAA_LIB_PATH &&
         KAA_SDK_TAR_NAME=$(find $PROJECT_HOME -iname $KAA_SDK_TAR)
 
         if [ -z "$KAA_SDK_TAR_NAME" ]
@@ -38,7 +38,6 @@ function unpackSources {
 }
 
 function copySources {
-    
     current_folder_name=${PWD##*/}
     if [ ! -d "$ECONAIS_HOME_VAR/applications" ]
     then
@@ -48,7 +47,6 @@ function copySources {
     mkdir -p "$ECONAIS_HOME_VAR/applications/$current_folder_name"
     cp -r ./src "$ECONAIS_HOME_VAR/applications/$current_folder_name"
     cp -r ./cfg "$ECONAIS_HOME_VAR/applications/$current_folder_name"
-    
 }
 
 function generateKey {
diff --git a/eventdemo/source/cpp/build.bat b/eventdemo/source/cpp/build.bat
index 007e56dd9..21def9a14 100755
--- a/eventdemo/source/cpp/build.bat
+++ b/eventdemo/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
@@ -128,4 +128,4 @@ goto :eof
 echo "Choose one of the following: {build|run|deploy|clean}"
 goto :eof
 
-endlocal
\ No newline at end of file
+endlocal
diff --git a/notificationdemo/source/cpp/build.bat b/notificationdemo/source/cpp/build.bat
index ef71aebf0..5991f2d6f 100755
--- a/notificationdemo/source/cpp/build.bat
+++ b/notificationdemo/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
diff --git a/sparkdemo/source/cpp/build.bat b/sparkdemo/source/cpp/build.bat
index 85d28caf6..1b7cb9118 100755
--- a/sparkdemo/source/cpp/build.bat
+++ b/sparkdemo/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
diff --git a/sparkdemo/source/cpp/build.sh b/sparkdemo/source/cpp/build.sh
index a5e5154fb..7ac81fb1d 100755
--- a/sparkdemo/source/cpp/build.sh
+++ b/sparkdemo/source/cpp/build.sh
@@ -36,7 +36,7 @@ LIBS_PATH="libs"
 KAA_LIB_PATH="$LIBS_PATH/kaa"
 KAA_C_LIB_HEADER_PATH="$KAA_LIB_PATH/src"
 KAA_CPP_LIB_HEADER_PATH="$KAA_LIB_PATH/kaa"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 KAA_TOOLCHAIN_PATH_SDK=""
 
 function select_arch {
diff --git a/stormdemo/source/c/build.bat b/stormdemo/source/c/build.bat
index e058143a3..8f100fd30 100755
--- a/stormdemo/source/c/build.bat
+++ b/stormdemo/source/c/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
@@ -128,4 +128,4 @@ goto :eof
 echo "Choose one of the following: {build|run|deploy|clean}"
 goto :eof
 
-endlocal
\ No newline at end of file
+endlocal
diff --git a/stormdemo/source/c/build.sh b/stormdemo/source/c/build.sh
index 519631764..5f9bc7487 100755
--- a/stormdemo/source/c/build.sh
+++ b/stormdemo/source/c/build.sh
@@ -35,7 +35,7 @@ LIBS_PATH="libs"
 KAA_LIB_PATH="$LIBS_PATH/kaa"
 KAA_C_LIB_HEADER_PATH="$KAA_LIB_PATH/src"
 KAA_CPP_LIB_HEADER_PATH="$KAA_LIB_PATH/kaa"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 
 function build_thirdparty {
     if [[ ! -d "$KAA_C_LIB_HEADER_PATH" &&  ! -d "$KAA_CPP_LIB_HEADER_PATH" ]]
diff --git a/stormdemo/source/cpp/build.bat b/stormdemo/source/cpp/build.bat
index e058143a3..8f100fd30 100755
--- a/stormdemo/source/cpp/build.bat
+++ b/stormdemo/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
@@ -128,4 +128,4 @@ goto :eof
 echo "Choose one of the following: {build|run|deploy|clean}"
 goto :eof
 
-endlocal
\ No newline at end of file
+endlocal
diff --git a/stormdemo/source/cpp/build.sh b/stormdemo/source/cpp/build.sh
index f67349670..c11639304 100755
--- a/stormdemo/source/cpp/build.sh
+++ b/stormdemo/source/cpp/build.sh
@@ -35,7 +35,7 @@ LIBS_PATH="libs"
 KAA_LIB_PATH="$LIBS_PATH/kaa"
 KAA_C_LIB_HEADER_PATH="$KAA_LIB_PATH/src"
 KAA_CPP_LIB_HEADER_PATH="$KAA_LIB_PATH/kaa"
-KAA_SDK_TAR="kaa-client*.tar.gz"
+KAA_SDK_TAR="kaa-c*.tar.gz"
 
 function build_thirdparty {
     if [[ ! -d "$KAA_C_LIB_HEADER_PATH" &&  ! -d "$KAA_CPP_LIB_HEADER_PATH" ]]
diff --git a/vehicletelemetry/source/cpp/build.bat b/vehicletelemetry/source/cpp/build.bat
index 8a3182d3b..8a53eb387 100755
--- a/vehicletelemetry/source/cpp/build.bat
+++ b/vehicletelemetry/source/cpp/build.bat
@@ -30,7 +30,7 @@ set LIBS_PATH=libs
 set KAA_LIB_PATH=%LIBS_PATH%\kaa
 set KAA_C_LIB_HEADER_PATH=%KAA_LIB_PATH%\src
 set KAA_CPP_LIB_HEADER_PATH=%KAA_LIB_PATH%\kaa
-set KAA_SDK_TAR="kaa-client*.tar.gz"
+set KAA_SDK_TAR="kaa-c*.tar.gz"
 
 set KAA_SDK_TAR_NAME=
 
@@ -127,4 +127,4 @@ goto :eof
 echo "Choose one of the following: {build|run|deploy|clean}"
 goto :eof
 
-endlocal
\ No newline at end of file
+endlocal

From b2c25684fa7a54e8cd7e5525cba6730a14ced0a7 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@cybervisiontech.com>
Date: Mon, 21 Mar 2016 12:37:41 +0200
Subject: [PATCH 04/42] Version set to 1.2.2-SNAPSHOT

---
 activationdemo/pom.xml                     | 2 +-
 cassandrademo/pom.xml                      | 2 +-
 cellmonitor/pom.xml                        | 2 +-
 cityguide/pom.xml                          | 2 +-
 citylights-controller/pom.xml              | 2 +-
 common/pom.xml                             | 2 +-
 configurationdemo/pom.xml                  | 2 +-
 connectedcar/pom.xml                       | 2 +-
 datacollectiondemo/pom.xml                 | 2 +-
 econais/ec19d/pom.xml                      | 2 +-
 econais/ec19d/streetlight-driver/pom.xml   | 2 +-
 econais/ec19d/trafficlights-driver/pom.xml | 2 +-
 econais/pom.xml                            | 2 +-
 eventdemo/pom.xml                          | 2 +-
 gpiocontrol/pom.xml                        | 2 +-
 iotworld/pom.xml                           | 2 +-
 notificationdemo/pom.xml                   | 2 +-
 ota/pom.xml                                | 2 +-
 photoframe/pom.xml                         | 2 +-
 pom.xml                                    | 4 ++--
 powerplant-android/pom.xml                 | 2 +-
 powerplant-couchbase-proxy/pom.xml         | 2 +-
 powerplant-dashboard/pom.xml               | 2 +-
 powerplant/pom.xml                         | 2 +-
 smarthousedemo/pom.xml                     | 2 +-
 sparkdemo/pom.xml                          | 2 +-
 stormdemo/pom.xml                          | 2 +-
 twitterled/pom.xml                         | 2 +-
 twitterled/twitterboard/pom.xml            | 2 +-
 twitterled/twittermonitor/pom.xml          | 2 +-
 vehicletelemetry/pom.xml                   | 2 +-
 verifiersdemo/pom.xml                      | 2 +-
 zeppelindemo/pom.xml                       | 2 +-
 zeppelindemo/source/java/pom.xml           | 2 +-
 34 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/activationdemo/pom.xml b/activationdemo/pom.xml
index f0d9f646a..3525c586d 100755
--- a/activationdemo/pom.xml
+++ b/activationdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cassandrademo/pom.xml b/cassandrademo/pom.xml
index dcc244b71..715d25f46 100644
--- a/cassandrademo/pom.xml
+++ b/cassandrademo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cellmonitor/pom.xml b/cellmonitor/pom.xml
index c15d53e20..985044854 100755
--- a/cellmonitor/pom.xml
+++ b/cellmonitor/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cityguide/pom.xml b/cityguide/pom.xml
index 86eca02e9..a61ec2ba8 100755
--- a/cityguide/pom.xml
+++ b/cityguide/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/citylights-controller/pom.xml b/citylights-controller/pom.xml
index 359895559..662408112 100755
--- a/citylights-controller/pom.xml
+++ b/citylights-controller/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 5cad9afff..4b653538c 100755
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/configurationdemo/pom.xml b/configurationdemo/pom.xml
index 75c2a1496..d0944f411 100755
--- a/configurationdemo/pom.xml
+++ b/configurationdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/connectedcar/pom.xml b/connectedcar/pom.xml
index 2299199ad..740dcc350 100755
--- a/connectedcar/pom.xml
+++ b/connectedcar/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/datacollectiondemo/pom.xml b/datacollectiondemo/pom.xml
index b5670ea1c..570f4ddc1 100755
--- a/datacollectiondemo/pom.xml
+++ b/datacollectiondemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/econais/ec19d/pom.xml b/econais/ec19d/pom.xml
index 6963fd3c0..ee50b295b 100755
--- a/econais/ec19d/pom.xml
+++ b/econais/ec19d/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>econais</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais</groupId>
diff --git a/econais/ec19d/streetlight-driver/pom.xml b/econais/ec19d/streetlight-driver/pom.xml
index cc816348c..1f681a379 100755
--- a/econais/ec19d/streetlight-driver/pom.xml
+++ b/econais/ec19d/streetlight-driver/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples.econais</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>ec19d</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais.ec19d</groupId>
diff --git a/econais/ec19d/trafficlights-driver/pom.xml b/econais/ec19d/trafficlights-driver/pom.xml
index cf19368fd..85cf9f825 100755
--- a/econais/ec19d/trafficlights-driver/pom.xml
+++ b/econais/ec19d/trafficlights-driver/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples.econais</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>ec19d</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais.ec19d</groupId>
diff --git a/econais/pom.xml b/econais/pom.xml
index 45b229127..4414724a3 100755
--- a/econais/pom.xml
+++ b/econais/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/eventdemo/pom.xml b/eventdemo/pom.xml
index def103a9d..72952fc9b 100755
--- a/eventdemo/pom.xml
+++ b/eventdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/gpiocontrol/pom.xml b/gpiocontrol/pom.xml
index f95da062b..d7f10789f 100644
--- a/gpiocontrol/pom.xml
+++ b/gpiocontrol/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/iotworld/pom.xml b/iotworld/pom.xml
index 32d0e8640..1bd61f565 100755
--- a/iotworld/pom.xml
+++ b/iotworld/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/notificationdemo/pom.xml b/notificationdemo/pom.xml
index c1199534f..4b0128c89 100755
--- a/notificationdemo/pom.xml
+++ b/notificationdemo/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/ota/pom.xml b/ota/pom.xml
index 6f5a850b6..08827e897 100755
--- a/ota/pom.xml
+++ b/ota/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/photoframe/pom.xml b/photoframe/pom.xml
index 7a9330479..8af3cd98c 100755
--- a/photoframe/pom.xml
+++ b/photoframe/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/pom.xml b/pom.xml
index fba5ad92b..6c4b4d34c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.kaaproject.kaa</groupId>
     <artifactId>examples</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Sample applications for Kaa Sandbox</name>
@@ -27,7 +27,7 @@
 
     <properties>
         <main.dir>${basedir}</main.dir>
-        <kaa.version>0.8.1</kaa.version>
+        <kaa.version>0.8.2-SNAPSHOT</kaa.version>
         <jackson.version>2.4.1</jackson.version>
         <avro.version>1.7.5</avro.version>
         <junit.version>4.11</junit.version>
diff --git a/powerplant-android/pom.xml b/powerplant-android/pom.xml
index a0ddeae56..33daa5cea 100755
--- a/powerplant-android/pom.xml
+++ b/powerplant-android/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant-couchbase-proxy/pom.xml b/powerplant-couchbase-proxy/pom.xml
index 80bc21369..98d874e60 100755
--- a/powerplant-couchbase-proxy/pom.xml
+++ b/powerplant-couchbase-proxy/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant-dashboard/pom.xml b/powerplant-dashboard/pom.xml
index 50d03e931..e40420d98 100755
--- a/powerplant-dashboard/pom.xml
+++ b/powerplant-dashboard/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant/pom.xml b/powerplant/pom.xml
index 69f96d752..232c68fdb 100755
--- a/powerplant/pom.xml
+++ b/powerplant/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/smarthousedemo/pom.xml b/smarthousedemo/pom.xml
index f56259921..e2657d7ca 100755
--- a/smarthousedemo/pom.xml
+++ b/smarthousedemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/sparkdemo/pom.xml b/sparkdemo/pom.xml
index 8e97fa638..e75a1eaa3 100644
--- a/sparkdemo/pom.xml
+++ b/sparkdemo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/stormdemo/pom.xml b/stormdemo/pom.xml
index a19deccd8..d292dbb23 100644
--- a/stormdemo/pom.xml
+++ b/stormdemo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/twitterled/pom.xml b/twitterled/pom.xml
index b7b582a5c..55ba2a1b3 100755
--- a/twitterled/pom.xml
+++ b/twitterled/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/twitterled/twitterboard/pom.xml b/twitterled/twitterboard/pom.xml
index cc3d89e02..5c5a15d6b 100755
--- a/twitterled/twitterboard/pom.xml
+++ b/twitterled/twitterboard/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>twitterled</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.twitterled</groupId>
diff --git a/twitterled/twittermonitor/pom.xml b/twitterled/twittermonitor/pom.xml
index ae1d249e8..ac72e3519 100755
--- a/twitterled/twittermonitor/pom.xml
+++ b/twitterled/twittermonitor/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>twitterled</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.twitterled</groupId>
diff --git a/vehicletelemetry/pom.xml b/vehicletelemetry/pom.xml
index 45c0626f0..a472c5e1d 100755
--- a/vehicletelemetry/pom.xml
+++ b/vehicletelemetry/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/verifiersdemo/pom.xml b/verifiersdemo/pom.xml
index 81da86c40..dd653b953 100755
--- a/verifiersdemo/pom.xml
+++ b/verifiersdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/zeppelindemo/pom.xml b/zeppelindemo/pom.xml
index 9b94d66db..33b7c1307 100644
--- a/zeppelindemo/pom.xml
+++ b/zeppelindemo/pom.xml
@@ -21,7 +21,7 @@
 <parent>
     <artifactId>examples</artifactId>
     <groupId>org.kaaproject.kaa</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
 </parent>
 
 <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/zeppelindemo/source/java/pom.xml b/zeppelindemo/source/java/pom.xml
index ac0284c18..8ae6a7780 100644
--- a/zeppelindemo/source/java/pom.xml
+++ b/zeppelindemo/source/java/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>org.kaaproject.kaa.demo.zeppelin</groupId>
     <artifactId>simulator</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Kaa, Cassandra, Zeppelin demo</name>

From b0cbf0a49c07191709279246b96db734e21c2325 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@cybervisiontech.com>
Date: Mon, 21 Mar 2016 14:11:21 +0200
Subject: [PATCH 05/42] Version set to 1.3.0

---
 activationdemo/pom.xml                     | 2 +-
 cassandrademo/pom.xml                      | 2 +-
 cellmonitor/pom.xml                        | 2 +-
 cityguide/pom.xml                          | 2 +-
 citylights-controller/pom.xml              | 2 +-
 common/pom.xml                             | 2 +-
 configurationdemo/pom.xml                  | 2 +-
 connectedcar/pom.xml                       | 2 +-
 datacollectiondemo/pom.xml                 | 2 +-
 econais/ec19d/pom.xml                      | 2 +-
 econais/ec19d/streetlight-driver/pom.xml   | 2 +-
 econais/ec19d/trafficlights-driver/pom.xml | 2 +-
 econais/pom.xml                            | 2 +-
 eventdemo/pom.xml                          | 2 +-
 gpiocontrol/pom.xml                        | 2 +-
 iotworld/pom.xml                           | 2 +-
 notificationdemo/pom.xml                   | 2 +-
 ota/pom.xml                                | 2 +-
 photoframe/pom.xml                         | 2 +-
 pom.xml                                    | 2 +-
 powerplant-android/pom.xml                 | 2 +-
 powerplant-couchbase-proxy/pom.xml         | 2 +-
 powerplant-dashboard/pom.xml               | 2 +-
 powerplant/pom.xml                         | 2 +-
 smarthousedemo/pom.xml                     | 2 +-
 sparkdemo/pom.xml                          | 2 +-
 stormdemo/pom.xml                          | 2 +-
 twitterled/pom.xml                         | 2 +-
 twitterled/twitterboard/pom.xml            | 2 +-
 twitterled/twittermonitor/pom.xml          | 2 +-
 vehicletelemetry/pom.xml                   | 2 +-
 verifiersdemo/pom.xml                      | 2 +-
 zeppelindemo/pom.xml                       | 2 +-
 zeppelindemo/source/java/pom.xml           | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/activationdemo/pom.xml b/activationdemo/pom.xml
index 3525c586d..2fd7de3f8 100644
--- a/activationdemo/pom.xml
+++ b/activationdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cassandrademo/pom.xml b/cassandrademo/pom.xml
index 715d25f46..48422b920 100644
--- a/cassandrademo/pom.xml
+++ b/cassandrademo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cellmonitor/pom.xml b/cellmonitor/pom.xml
index 985044854..d927c9922 100644
--- a/cellmonitor/pom.xml
+++ b/cellmonitor/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cityguide/pom.xml b/cityguide/pom.xml
index a61ec2ba8..e791b8703 100644
--- a/cityguide/pom.xml
+++ b/cityguide/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/citylights-controller/pom.xml b/citylights-controller/pom.xml
index 662408112..bb71edc8a 100644
--- a/citylights-controller/pom.xml
+++ b/citylights-controller/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 4b653538c..aa6fec5be 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/configurationdemo/pom.xml b/configurationdemo/pom.xml
index d0944f411..513da582f 100644
--- a/configurationdemo/pom.xml
+++ b/configurationdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/connectedcar/pom.xml b/connectedcar/pom.xml
index 740dcc350..eb8d29f97 100644
--- a/connectedcar/pom.xml
+++ b/connectedcar/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/datacollectiondemo/pom.xml b/datacollectiondemo/pom.xml
index 570f4ddc1..40945e20b 100644
--- a/datacollectiondemo/pom.xml
+++ b/datacollectiondemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/econais/ec19d/pom.xml b/econais/ec19d/pom.xml
index ee50b295b..7baa707be 100644
--- a/econais/ec19d/pom.xml
+++ b/econais/ec19d/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>econais</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais</groupId>
diff --git a/econais/ec19d/streetlight-driver/pom.xml b/econais/ec19d/streetlight-driver/pom.xml
index 1f681a379..7977185b4 100644
--- a/econais/ec19d/streetlight-driver/pom.xml
+++ b/econais/ec19d/streetlight-driver/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples.econais</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>ec19d</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais.ec19d</groupId>
diff --git a/econais/ec19d/trafficlights-driver/pom.xml b/econais/ec19d/trafficlights-driver/pom.xml
index 85cf9f825..d1f66cd68 100644
--- a/econais/ec19d/trafficlights-driver/pom.xml
+++ b/econais/ec19d/trafficlights-driver/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples.econais</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>ec19d</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais.ec19d</groupId>
diff --git a/econais/pom.xml b/econais/pom.xml
index 4414724a3..5dedea0cc 100644
--- a/econais/pom.xml
+++ b/econais/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/eventdemo/pom.xml b/eventdemo/pom.xml
index 72952fc9b..5ce06fa24 100644
--- a/eventdemo/pom.xml
+++ b/eventdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/gpiocontrol/pom.xml b/gpiocontrol/pom.xml
index d7f10789f..8a84c610a 100644
--- a/gpiocontrol/pom.xml
+++ b/gpiocontrol/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/iotworld/pom.xml b/iotworld/pom.xml
index 1bd61f565..559427bf9 100644
--- a/iotworld/pom.xml
+++ b/iotworld/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/notificationdemo/pom.xml b/notificationdemo/pom.xml
index 4b0128c89..2cba7cd4f 100644
--- a/notificationdemo/pom.xml
+++ b/notificationdemo/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/ota/pom.xml b/ota/pom.xml
index 08827e897..a69522449 100644
--- a/ota/pom.xml
+++ b/ota/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/photoframe/pom.xml b/photoframe/pom.xml
index 8af3cd98c..26ba7dc49 100644
--- a/photoframe/pom.xml
+++ b/photoframe/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/pom.xml b/pom.xml
index 6c4b4d34c..397e6d1b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.kaaproject.kaa</groupId>
     <artifactId>examples</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Sample applications for Kaa Sandbox</name>
diff --git a/powerplant-android/pom.xml b/powerplant-android/pom.xml
index 33daa5cea..a6e40dad1 100644
--- a/powerplant-android/pom.xml
+++ b/powerplant-android/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant-couchbase-proxy/pom.xml b/powerplant-couchbase-proxy/pom.xml
index 98d874e60..2c64de59e 100644
--- a/powerplant-couchbase-proxy/pom.xml
+++ b/powerplant-couchbase-proxy/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant-dashboard/pom.xml b/powerplant-dashboard/pom.xml
index e40420d98..41a9f10c2 100644
--- a/powerplant-dashboard/pom.xml
+++ b/powerplant-dashboard/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant/pom.xml b/powerplant/pom.xml
index 232c68fdb..b44543b1f 100644
--- a/powerplant/pom.xml
+++ b/powerplant/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/smarthousedemo/pom.xml b/smarthousedemo/pom.xml
index e2657d7ca..c1a58dd8a 100644
--- a/smarthousedemo/pom.xml
+++ b/smarthousedemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/sparkdemo/pom.xml b/sparkdemo/pom.xml
index e75a1eaa3..5a2d3bbe1 100644
--- a/sparkdemo/pom.xml
+++ b/sparkdemo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/stormdemo/pom.xml b/stormdemo/pom.xml
index d292dbb23..4671dc251 100644
--- a/stormdemo/pom.xml
+++ b/stormdemo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/twitterled/pom.xml b/twitterled/pom.xml
index 55ba2a1b3..2b5b1d9b2 100644
--- a/twitterled/pom.xml
+++ b/twitterled/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/twitterled/twitterboard/pom.xml b/twitterled/twitterboard/pom.xml
index 5c5a15d6b..039f89632 100644
--- a/twitterled/twitterboard/pom.xml
+++ b/twitterled/twitterboard/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>twitterled</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.twitterled</groupId>
diff --git a/twitterled/twittermonitor/pom.xml b/twitterled/twittermonitor/pom.xml
index ac72e3519..ecf743af6 100644
--- a/twitterled/twittermonitor/pom.xml
+++ b/twitterled/twittermonitor/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>twitterled</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.twitterled</groupId>
diff --git a/vehicletelemetry/pom.xml b/vehicletelemetry/pom.xml
index a472c5e1d..f95bfcc8a 100644
--- a/vehicletelemetry/pom.xml
+++ b/vehicletelemetry/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/verifiersdemo/pom.xml b/verifiersdemo/pom.xml
index dd653b953..0f7e55f1f 100644
--- a/verifiersdemo/pom.xml
+++ b/verifiersdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/zeppelindemo/pom.xml b/zeppelindemo/pom.xml
index 33b7c1307..b52b3a32d 100644
--- a/zeppelindemo/pom.xml
+++ b/zeppelindemo/pom.xml
@@ -21,7 +21,7 @@
 <parent>
     <artifactId>examples</artifactId>
     <groupId>org.kaaproject.kaa</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
 </parent>
 
 <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/zeppelindemo/source/java/pom.xml b/zeppelindemo/source/java/pom.xml
index 8ae6a7780..80136afbd 100644
--- a/zeppelindemo/source/java/pom.xml
+++ b/zeppelindemo/source/java/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>org.kaaproject.kaa.demo.zeppelin</groupId>
     <artifactId>simulator</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Kaa, Cassandra, Zeppelin demo</name>

From dc809181fd50bcf6d1fd95b9459c36e03c7fbcda Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@cybervisiontech.com>
Date: Mon, 21 Mar 2016 14:13:08 +0200
Subject: [PATCH 06/42] mend

Version set to 1.3.0-SNAPSHOT
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 397e6d1b2..431410e7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     <properties>
         <main.dir>${basedir}</main.dir>
-        <kaa.version>0.8.2-SNAPSHOT</kaa.version>
+        <kaa.version>0.9.0-SNAPSHOT</kaa.version>
         <jackson.version>2.4.1</jackson.version>
         <avro.version>1.7.5</avro.version>
         <junit.version>4.11</junit.version>

From a945afb8a84cfab2fdae30f2477df37b72bb2296 Mon Sep 17 00:00:00 2001
From: Anton Bohomol <anton.bogomol@gmail.com>
Date: Mon, 28 Mar 2016 11:30:39 +0300
Subject: [PATCH 07/42] APP: remove duplicated files for Android application

---
 .../res/layout/activity_cell_monitor.xml      | 26 -----------------
 cellmonitor/source/res/values-v11/styles.xml  | 24 ---------------
 cellmonitor/source/res/values-v14/styles.xml  | 24 ---------------
 cellmonitor/source/res/values-v21/styles.xml  | 25 ----------------
 .../source/res/values-w820dp/dimens.xml       | 23 ---------------
 cellmonitor/source/res/values/dimens.xml      | 25 ----------------
 cellmonitor/source/res/values/styles.xml      | 29 -------------------
 .../event/CellLocationChanged.java            | 24 ---------------
 .../cellmonitor/event/GpsLocationChanged.java | 24 ---------------
 .../kaa/demo/cellmonitor/event/LogSent.java   | 27 -----------------
 .../event/SignalStrengthChanged.java          | 24 ---------------
 11 files changed, 275 deletions(-)
 delete mode 100644 cellmonitor/source/res/layout/activity_cell_monitor.xml
 delete mode 100644 cellmonitor/source/res/values-v11/styles.xml
 delete mode 100644 cellmonitor/source/res/values-v14/styles.xml
 delete mode 100644 cellmonitor/source/res/values-v21/styles.xml
 delete mode 100644 cellmonitor/source/res/values-w820dp/dimens.xml
 delete mode 100644 cellmonitor/source/res/values/dimens.xml
 delete mode 100644 cellmonitor/source/res/values/styles.xml
 delete mode 100644 cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/CellLocationChanged.java
 delete mode 100644 cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/GpsLocationChanged.java
 delete mode 100644 cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/LogSent.java
 delete mode 100644 cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/SignalStrengthChanged.java

diff --git a/cellmonitor/source/res/layout/activity_cell_monitor.xml b/cellmonitor/source/res/layout/activity_cell_monitor.xml
deleted file mode 100644
index 1bfa39cb5..000000000
--- a/cellmonitor/source/res/layout/activity_cell_monitor.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="org.kaaproject.kaa.demo.cellmonitor.CellMonitorActivity"
-    tools:ignore="MergeRootFrame" />
-
diff --git a/cellmonitor/source/res/values-v11/styles.xml b/cellmonitor/source/res/values-v11/styles.xml
deleted file mode 100644
index f886acbcd..000000000
--- a/cellmonitor/source/res/values-v11/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<resources>
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    </style>
-
-</resources>
diff --git a/cellmonitor/source/res/values-v14/styles.xml b/cellmonitor/source/res/values-v14/styles.xml
deleted file mode 100644
index f886acbcd..000000000
--- a/cellmonitor/source/res/values-v14/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<resources>
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    </style>
-
-</resources>
diff --git a/cellmonitor/source/res/values-v21/styles.xml b/cellmonitor/source/res/values-v21/styles.xml
deleted file mode 100644
index 68c9fbdc7..000000000
--- a/cellmonitor/source/res/values-v21/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<resources>
-   
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- API 21 theme customizations can go here. -->
-    </style>
-
-</resources>
diff --git a/cellmonitor/source/res/values-w820dp/dimens.xml b/cellmonitor/source/res/values-w820dp/dimens.xml
deleted file mode 100644
index 635be2ae2..000000000
--- a/cellmonitor/source/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<resources>
-
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-
-</resources>
diff --git a/cellmonitor/source/res/values/dimens.xml b/cellmonitor/source/res/values/dimens.xml
deleted file mode 100644
index c5e50c39d..000000000
--- a/cellmonitor/source/res/values/dimens.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-</resources>
diff --git a/cellmonitor/source/res/values/styles.xml b/cellmonitor/source/res/values/styles.xml
deleted file mode 100644
index 019552812..000000000
--- a/cellmonitor/source/res/values/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-
-     Copyright 2014-2016 CyberVision, Inc.
-
-     Licensed 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.
-
--->
-
-<resources>
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    </style>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <item name="actionBarWidgetTheme">@style/Theme.AppCompat.Light.DarkActionBar</item>
-    </style>
-
-</resources>
diff --git a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/CellLocationChanged.java b/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/CellLocationChanged.java
deleted file mode 100644
index fa4954391..000000000
--- a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/CellLocationChanged.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *  Copyright 2014-2016 CyberVision, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.kaaproject.kaa.demo.cellmonitor.event;
-
-/**
- * An event class that is used to notify UI components after a GSM cell location was changed.
- */
-public class CellLocationChanged {
-    
-}
diff --git a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/GpsLocationChanged.java b/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/GpsLocationChanged.java
deleted file mode 100644
index 0a43dbe51..000000000
--- a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/GpsLocationChanged.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *  Copyright 2014-2016 CyberVision, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.kaaproject.kaa.demo.cellmonitor.event;
-
-/**
- * An event class that is used to notify UI components after a phone GPS location was changed.
- */
-public class GpsLocationChanged {
-
-}
diff --git a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/LogSent.java b/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/LogSent.java
deleted file mode 100644
index b7a42db4f..000000000
--- a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/LogSent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *  Copyright 2014-2016 CyberVision, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.kaaproject.kaa.demo.cellmonitor.event;
-
-import org.kaaproject.kaa.client.KaaClient;
-
-/**
- * An event class that is used to notify UI components when {@link KaaClient#addLogRecord(org.kaaproject.kaa.demo.cellmonitor.CellMonitorLog)} 
- * operation was performed.
- */
-public class LogSent {
-
-}
diff --git a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/SignalStrengthChanged.java b/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/SignalStrengthChanged.java
deleted file mode 100644
index 16efb7c7e..000000000
--- a/cellmonitor/source/src/org/kaaproject/kaa/demo/cellmonitor/event/SignalStrengthChanged.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *  Copyright 2014-2016 CyberVision, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.kaaproject.kaa.demo.cellmonitor.event;
-
-/**
- * An event class that is used to notify UI components after strength of a mobile signal was changed.
- */
-public class SignalStrengthChanged {
-
-}

From a03eead26786562849a72e809f8cb693ddca9514 Mon Sep 17 00:00:00 2001
From: Andrey Snitsaruk <asnitsaruk@cybervisiontech.com>
Date: Mon, 28 Mar 2016 19:35:18 +0300
Subject: [PATCH 08/42] APP-62: Fixed crash after Twitter authorization

---
 .../src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java b/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
index 37ad6714f..392286a23 100644
--- a/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
+++ b/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
@@ -274,6 +274,7 @@ public void updateUI(String userName, String userId, String token, AccountType t
             case TWITTER:
                 kaaVerifierToken = verifiersTokens.getTwitterKaaVerifierToken();
                 Session.getActiveSession().closeAndClearTokenInformation();
+                getVerifiersApplication().resume();
                 break;
         }
 

From 8d46071f2ad410c5f61ad00b035ca993c5db1a26 Mon Sep 17 00:00:00 2001
From: Andrey Snitsaruk <snitsaruk@gmail.com>
Date: Fri, 25 Mar 2016 17:34:24 +0200
Subject: [PATCH 09/42] Improved activity layout

---
 .../source/res/layout/activity_logins.xml     | 148 ++++++++++++------
 .../kaa/demo/verifiersdemo/LoginActivity.java |  55 +++++--
 2 files changed, 143 insertions(+), 60 deletions(-)

diff --git a/verifiersdemo/source/res/layout/activity_logins.xml b/verifiersdemo/source/res/layout/activity_logins.xml
index 19a41ce6f..e674f4213 100644
--- a/verifiersdemo/source/res/layout/activity_logins.xml
+++ b/verifiersdemo/source/res/layout/activity_logins.xml
@@ -18,25 +18,10 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="fill_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.gms.common.SignInButton
-        android:id="@+id/gplus_sign_in_button"
-        android:layout_width="230dp"
-        android:layout_height="50dp"
-        android:layout_alignLeft="@+id/facebook_sign_in_button"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="10dp" >
-    </com.google.android.gms.common.SignInButton>
-
-    <com.twitter.sdk.android.core.identity.TwitterLoginButton
-        android:id="@+id/twitter_sign_in_button"
-        android:layout_width="230dp"
-        android:layout_height="46dp"
-        android:layout_below="@+id/facebook_sign_in_button"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp" />
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/infoText"
@@ -44,7 +29,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/twitter_sign_in_button"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="17dp"
+        android:layout_marginTop="20dp"
+        android:text="Authorize to send event"
         android:textColor="#333"
         android:textSize="18sp" />
 
@@ -54,6 +40,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/infoText"
         android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:text="FACEBOOK user name: Andrey"
         android:textColor="#333"
         android:textSize="14sp" />
 
@@ -63,16 +51,24 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/greeting"
         android:layout_centerHorizontal="true"
-        android:paddingBottom="50dp"
+        android:text="FACEBOOK user id: 232"
         android:textColor="#333"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        android:visibility="gone" />
 
     <EditText
         android:id="@+id/eventMessages"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@+id/msgBox"
+        android:layout_height="300dp"
+        android:layout_above="@+id/linearLayout2"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/greeting"
+        android:layout_marginBottom="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:autoLink="all"
+        android:background="@color/tw__transparent"
         android:clickable="false"
         android:cursorVisible="false"
         android:editable="false"
@@ -82,34 +78,90 @@
         android:longClickable="false"
         android:scrollbars="vertical" />
 
-    <Button
-        android:id="@+id/sendEventButton"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/linearLayout"
+        android:layout_marginBottom="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+
+        <EditText
+            android:id="@+id/msgBox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center|bottom"
+            android:layout_marginRight="10dp"
+            android:layout_weight="1"
+            android:ems="10"
+            android:hint="@string/msg_hint"
+            android:longClickable="false"
+            android:maxLength="20" />
+
+        <Button
+            android:id="@+id/sendEventButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/send_btn_label" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/msgBox"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="18dp"
-        android:text="@string/send_btn_label" />
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/mockFbButton"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:background="@color/tw__transparent"
+            android:scaleType="centerInside"
+            android:src="@drawable/auth_fb" />
+
+        <ImageButton
+            android:id="@+id/mockGplusButton"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_weight="2"
+            android:background="@color/tw__transparent"
+            android:scaleType="centerInside"
+            android:src="@drawable/auth_gplus" />
+
+        <ImageButton
+            android:id="@+id/mockTwitterButton"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:background="@color/tw__transparent"
+            android:scaleType="centerInside"
+            android:src="@drawable/auth_twitter" />
+
+    </LinearLayout>
+
+    <com.google.android.gms.common.SignInButton
+        android:id="@+id/gplus_sign_in_button"
+        android:layout_width="1px"
+        android:layout_height="1px"
+        android:visibility="invisible" />
 
     <com.facebook.widget.LoginButton
         android:id="@+id/facebook_sign_in_button"
-        android:layout_width="230dp"
-        android:layout_height="46dp"
-        android:layout_alignLeft="@+id/twitter_sign_in_button"
-        android:layout_below="@+id/gplus_sign_in_button"
-        android:layout_marginTop="10dp" />
+        android:layout_width="1px"
+        android:layout_height="1px"
+        android:visibility="invisible" />
 
-    <EditText
-        android:id="@+id/msgBox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/idText"
-        android:layout_toLeftOf="@+id/sendEventButton"
-        android:ems="10"
-        android:hint="@string/msg_hint"
-        android:longClickable="false"
-        android:layout_marginTop="20dp"
-        android:maxLength="20" />
+    <com.twitter.sdk.android.core.identity.TwitterLoginButton
+        android:id="@+id/twitter_sign_in_button"
+        android:layout_width="1px"
+        android:layout_height="1px"
+        android:visibility="invisible" />
 
 </RelativeLayout>
diff --git a/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java b/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
index 37ad6714f..f8d14680e 100644
--- a/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
+++ b/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
@@ -78,7 +78,12 @@ public enum EventStatus {
         RECEIVED, SENT}
 
     private TwitterLoginButton twitterButton;
+    private SignInButton googleButton;
+    private LoginButton facebookButton;
     private Button sendEventButton;
+    private ImageButton mockFbButton;
+    private ImageButton mockGplusButton;
+    private ImageButton mockTwitterButton;
     private boolean sendingEventsEnabled;
 
     private GplusSigninListener gplusSigninListener;
@@ -116,10 +121,17 @@ protected void onCreate(Bundle savedInstanceState) {
         idTextView = (TextView) findViewById(R.id.idText);
         infoTextView = (TextView) findViewById(R.id.infoText);
         sendEventButton = (Button) findViewById(R.id.sendEventButton);
-        sendEventButton.setEnabled(sendingEventsEnabled);
+        mockFbButton = (ImageButton) findViewById(R.id.mockFbButton);
+        mockGplusButton = (ImageButton) findViewById(R.id.mockGplusButton);
+        mockTwitterButton = (ImageButton) findViewById(R.id.mockTwitterButton);
         messageEdit = (EditText) findViewById(R.id.msgBox);
         eventMessagesEdit = (EditText) findViewById(R.id.eventMessages);
 
+        sendEventButton.setEnabled(sendingEventsEnabled);
+        mockTwitterButton.setOnClickListener(mClickListener);
+        mockGplusButton.setOnClickListener(mClickListener);
+        mockFbButton.setOnClickListener(mClickListener);
+
         if (savedInstanceState != null) {
             currentUserName = savedInstanceState.getCharSequence(USER_NAME);
             currentUserId = savedInstanceState.getCharSequence(USER_ID);
@@ -127,12 +139,12 @@ protected void onCreate(Bundle savedInstanceState) {
             eventMessagesText = savedInstanceState.getCharSequence(EVENT_MESSAGES);
             updateViews();
         }
-        
+
         /*
             Creating a Twitter authConfig for Twitter credentials verification.
          */
         TwitterAuthConfig authConfig = new TwitterAuthConfig(TWITTER_KEY, TWITTER_SECRET);
-        
+
         /*
              Register the application using Fabric plug-in for managing Twitter apps
          */
@@ -146,16 +158,16 @@ protected void onCreate(Bundle savedInstanceState) {
         twitterButton.setCallback(twitterSigninListener);
         twitterButton.setOnClickListener(twitterSigninListener);
         twitterButton.setEnabled(true);
-        
+
         /*
             Creating a listeners class for Google+.
          */
         gplusSigninListener = new GplusSigninListener(this);
 
-        SignInButton googleButton = (SignInButton) findViewById(R.id.gplus_sign_in_button);
+        googleButton = (SignInButton) findViewById(R.id.gplus_sign_in_button);
         googleButton.setSize(SignInButton.SIZE_WIDE);
         googleButton.setOnClickListener(gplusSigninListener);
-        
+
         /*
             Creating the Google API client capable of making requests for tokens, user info etc.
          */
@@ -166,15 +178,15 @@ protected void onCreate(Bundle savedInstanceState) {
                 .addScope(Plus.SCOPE_PLUS_LOGIN)
                 .build();
         gplusSigninListener.setClient(mGoogleApiClient);
-        
+
         /*
             Creates listener for Facebook.
          */
         FacebookSigninListener facebookSigninListener = new FacebookSigninListener(this);
-        LoginButton facebookButton = (LoginButton) findViewById(R.id.facebook_sign_in_button);
+        facebookButton = (LoginButton) findViewById(R.id.facebook_sign_in_button);
 
         facebookButton.setUserInfoChangedCallback(facebookSigninListener);
-        
+
         /*
             Creating the UI helper for managing the Facebook login UI.
          */
@@ -219,7 +231,7 @@ protected void onResume() {
     protected void onPause() {
         super.onPause();
         uiHelper.onPause();
-        
+
         /*
             Notify the application of the background state.
          */
@@ -235,7 +247,7 @@ protected void onDestroy() {
     @Override
     public void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        
+
         /*
             Save the current state of the UI (for Facebook).
          */
@@ -358,6 +370,25 @@ public void onClick(View v) {
         }
     }
 
+    OnClickListener mClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.mockFbButton:
+                    facebookButton.callOnClick();
+                    break;
+
+                case R.id.mockTwitterButton:
+                    twitterButton.callOnClick();
+                    break;
+
+                case R.id.mockGplusButton:
+                    gplusSigninListener.onClick(v);
+                    break;
+            }
+        }
+    };
+
     private void addNewEventToChatBox(final EventStatus status, final String message) {
         this.runOnUiThread(new Runnable() {
             @Override
@@ -365,7 +396,7 @@ public void run() {
                 Calendar calendar = Calendar.getInstance();
                 SimpleDateFormat format = new SimpleDateFormat("[HH:mm:ss] ");
                 if (message != null && message.length() > 0) {
-                    eventMessagesEdit.setText(status + " " + format.format(calendar.getTime()) +
+                    eventMessagesEdit.setText(format.format(calendar.getTime()) + " " + status +
                             ": " + message + "\n" + eventMessagesEdit.getText());
                     eventMessagesText = eventMessagesEdit.getText();
                     messageEdit.setText(null);

From b6efafddf1bd7b69354dc94d72566d14e1c55a2b Mon Sep 17 00:00:00 2001
From: Andrey Snitsaruk <asnitsaruk@cybervisiontech.com>
Date: Mon, 28 Mar 2016 20:11:54 +0300
Subject: [PATCH 10/42] APP-62: Added drawables for social buttons (fix on
 previous commit)

---
 verifiersdemo/source/res/drawable/auth_fb.png    | Bin 0 -> 4973 bytes
 verifiersdemo/source/res/drawable/auth_gplus.png | Bin 0 -> 9435 bytes
 .../source/res/drawable/auth_twitter.png         | Bin 0 -> 7986 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 verifiersdemo/source/res/drawable/auth_fb.png
 create mode 100644 verifiersdemo/source/res/drawable/auth_gplus.png
 create mode 100644 verifiersdemo/source/res/drawable/auth_twitter.png

diff --git a/verifiersdemo/source/res/drawable/auth_fb.png b/verifiersdemo/source/res/drawable/auth_fb.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fd4330d7096ad315c30decf8a7fbcff43d7e474
GIT binary patch
literal 4973
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
X7Ci85d65tQ`+Plx=|Zt8wr~CiAM~<1

literal 0
HcmV?d00001

diff --git a/verifiersdemo/source/res/drawable/auth_gplus.png b/verifiersdemo/source/res/drawable/auth_gplus.png
new file mode 100644
index 0000000000000000000000000000000000000000..861b0852a54ad60facde2ec751dfae25e9235ea5
GIT binary patch
literal 9435
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
SONqa~8)>L&tJEvmM*kn+-G3GU

literal 0
HcmV?d00001

diff --git a/verifiersdemo/source/res/drawable/auth_twitter.png b/verifiersdemo/source/res/drawable/auth_twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..099dd6e3a1ca55857e8ef0a9f87886c6f2e6bd0f
GIT binary patch
literal 7986
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

literal 0
HcmV?d00001


From 23c99b985baaab54359da78f5f66a20d7ceb6664 Mon Sep 17 00:00:00 2001
From: Dubland <mshmalko@yandex.ru>
Date: Wed, 30 Mar 2016 17:11:39 +0300
Subject: [PATCH 11/42] APP-61 Spark demo broken build

---
 sparkdemo/source/cpp/src/KaaDemo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sparkdemo/source/cpp/src/KaaDemo.cpp b/sparkdemo/source/cpp/src/KaaDemo.cpp
index eedeaddf7..88a2bb181 100644
--- a/sparkdemo/source/cpp/src/KaaDemo.cpp
+++ b/sparkdemo/source/cpp/src/KaaDemo.cpp
@@ -36,7 +36,7 @@ using namespace kaa;
 // The following custom strategy uploads every log record as soon as it is created.
 class LogUploadStrategy : public DefaultLogUploadStrategy {
 public:
-    LogUploadStrategy() : DefaultLogUploadStrategy() {}
+    LogUploadStrategy(IKaaClientContext &context) : DefaultLogUploadStrategy(context) {}
 
     virtual LogUploadStrategyDecision isUploadNeeded(ILogStorageStatus& status)
     {
@@ -74,7 +74,7 @@ int main()
     auto kaaClient =  Kaa::newClient();
 
     // Set a custom strategy for uploading logs.
-    kaaClient->setLogUploadStrategy(std::make_shared<LogUploadStrategy>());
+    kaaClient->setLogUploadStrategy(std::make_shared<LogUploadStrategy>(kaaClient->getKaaClientContext()));
 
     // Start the Kaa client and connect it to the Kaa server.
     kaaClient->start();

From 7823d22a98b32cc2b67ae5df5bcbc1fa641cbe50 Mon Sep 17 00:00:00 2001
From: Dubland <mshmalko@yandex.ru>
Date: Wed, 30 Mar 2016 20:52:28 +0300
Subject: [PATCH 12/42] APP-61 Spark demo broken build

---
 sparkdemo/source/cpp/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sparkdemo/source/cpp/CMakeLists.txt b/sparkdemo/source/cpp/CMakeLists.txt
index 193e2b3ed..b373e78c0 100644
--- a/sparkdemo/source/cpp/CMakeLists.txt
+++ b/sparkdemo/source/cpp/CMakeLists.txt
@@ -39,7 +39,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib -std=gnu++11 -stdlib=libc++")
 endif()
 
-find_package (Boost 1.54 REQUIRED COMPONENTS log system)
+find_package (Boost 1.54 REQUIRED COMPONENTS log system thread)
 find_package (Avro REQUIRED)
 find_package (Botan REQUIRED)
 

From 40ad8ee792148608ad7ec7d2bea118bb1f9138cf Mon Sep 17 00:00:00 2001
From: Peter Krutsiuk <pkrutsiuk@cybervisiontech.com>
Date: Wed, 6 Apr 2016 11:06:44 +0300
Subject: [PATCH 13/42] Repalce https on http in links to kaa docs

---
 activationdemo/resources/projects.xml            |  2 +-
 cellmonitor/resources/projects.xml               |  2 +-
 citylights-controller/resources/projects.xml     |  2 +-
 configurationdemo/resources/projects.xml         |  2 +-
 configurationdemo/source/c/README.txt            | 12 ++++++------
 configurationdemo/source/esp8266/README.txt      |  8 ++++----
 datacollectiondemo/resources/projects.xml        |  2 +-
 datacollectiondemo/source/c/README.txt           | 12 ++++++------
 datacollectiondemo/source/cpp/README.txt         |  8 ++++----
 .../streetlight-driver/resources/projects.xml    |  2 +-
 .../trafficlights-driver/resources/projects.xml  |  2 +-
 eventdemo/resources/projects.xml                 |  2 +-
 eventdemo/source/c/README.txt                    |  8 ++++----
 eventdemo/source/cpp/README.txt                  |  8 ++++----
 gpiocontrol/resources/projects.xml               | 16 ++++++++--------
 gpiocontrol/source/artik5/README.txt             |  8 ++++----
 gpiocontrol/source/cc32xx/README.txt             |  8 ++++----
 gpiocontrol/source/esp8266/README.txt            |  8 ++++----
 notificationdemo/resources/projects.xml          |  2 +-
 notificationdemo/source/c/README.txt             |  8 ++++----
 notificationdemo/source/cpp/README.txt           |  8 ++++----
 ota/source/cc32xx/README.txt                     | 10 +++++-----
 powerplant-android/resources/projects.xml        |  2 +-
 powerplant/resources/projects.xml                |  2 +-
 powerplant/source/cpp/README.txt                 |  8 ++++----
 sparkdemo/source/cpp/README                      |  8 ++++----
 stormdemo/resources/projects.xml                 |  2 +-
 stormdemo/source/c/README                        | 12 ++++++------
 stormdemo/source/cpp/README                      |  8 ++++----
 vehicletelemetry/resources/projects.xml          | 10 +++++-----
 vehicletelemetry/source/cpp/README.txt           |  8 ++++----
 31 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/activationdemo/resources/projects.xml b/activationdemo/resources/projects.xml
index 2441d50d1..6e7af9eb8 100644
--- a/activationdemo/resources/projects.xml
+++ b/activationdemo/resources/projects.xml
@@ -52,7 +52,7 @@ Finally, it's time to see what determines the configuration data. Go to the "End
 
 The endpoints are put into either "Active device group" or "Inactive device group" depending on the "active" variable value in the server profile. See the corresponding profile filters in the group details window. Each endpoint group defines its own configuration (active or inactive) - and when the server-side profile for some EP is changed, the EP is moved from one group to another and this results in updated configuration being pushed by the server to the corresponding EP.<br/><br/>
 
-Please note that all features of the <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported via the <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all features of the <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported via the <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 
diff --git a/cellmonitor/resources/projects.xml b/cellmonitor/resources/projects.xml
index d6cc75f0b..2bbd46edd 100644
--- a/cellmonitor/resources/projects.xml
+++ b/cellmonitor/resources/projects.xml
@@ -118,7 +118,7 @@ For more background on the Kaa Logging subsystem please refer to the correspondi
             <![CDATA[
 This bundle contains applications that demonstrates capabilities of the Kaa Log collection subsystem.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 For more background on the Kaa Logging subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
diff --git a/citylights-controller/resources/projects.xml b/citylights-controller/resources/projects.xml
index ed6798426..c23115a16 100644
--- a/citylights-controller/resources/projects.xml
+++ b/citylights-controller/resources/projects.xml
@@ -40,7 +40,7 @@ TODO
 <h2>What's next?</h2>
 Get the source code by clicking the "Source" button on the left and start hacking!<br/><br/>
 
-For more background on Kaa data collection subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
+For more background on Kaa data collection subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
             ]]></details>
             
         <!-- Specifies the source code language of Kaa endpoint SDK which is used by this project 
diff --git a/configurationdemo/resources/projects.xml b/configurationdemo/resources/projects.xml
index bebf49b15..6859f7877 100644
--- a/configurationdemo/resources/projects.xml
+++ b/configurationdemo/resources/projects.xml
@@ -199,7 +199,7 @@ Please note that all the features of Administration UI are also supported by RES
             <![CDATA[
 This bundle contains applications that demonstrates capabilities of the Kaa Configuration subsystem.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 For more background on the Kaa Configuration subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Distributing+data+to+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Configuration">design reference</a> sections.
diff --git a/configurationdemo/source/c/README.txt b/configurationdemo/source/c/README.txt
index a281fcbb2..1c44e753f 100644
--- a/configurationdemo/source/c/README.txt
+++ b/configurationdemo/source/c/README.txt
@@ -19,9 +19,9 @@ PREFACE
 ************************************
 
 This demo application illustrates logging, configuration and profiling features using the Kaa C SDK.
-To read more about the logging feature visit https://docs.kaaproject.org/display/KAA/Logging.
-To read more about the configuration feature visit https://docs.kaaproject.org/display/KAA/Configuration.
-To read more about the profiling feature visit https://docs.kaaproject.org/display/KAA/Endpoint+profiling.
+To read more about the logging feature visit http://docs.kaaproject.org/display/KAA/Logging.
+To read more about the configuration feature visit http://docs.kaaproject.org/display/KAA/Configuration.
+To read more about the profiling feature visit http://docs.kaaproject.org/display/KAA/Endpoint+profiling.
 
 ************************************
 INSTALLATION
@@ -30,9 +30,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -42,5 +42,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/configurationdemo/source/esp8266/README.txt b/configurationdemo/source/esp8266/README.txt
index d860cc64d..1afee7856 100644
--- a/configurationdemo/source/esp8266/README.txt
+++ b/configurationdemo/source/esp8266/README.txt
@@ -19,9 +19,9 @@ PREFACE
 ************************************
 
 This demo application illustrates configuration feature using the Kaa C SDK.
-To read more about the logging feature visit https://docs.kaaproject.org/display/KAA/Logging.
-To read more about the configuration feature visit https://docs.kaaproject.org/display/KAA/Configuration.
-To read more about the profiling feature visit https://docs.kaaproject.org/display/KAA/Endpoint+profiling.
+To read more about the logging feature visit http://docs.kaaproject.org/display/KAA/Logging.
+To read more about the configuration feature visit http://docs.kaaproject.org/display/KAA/Configuration.
+To read more about the profiling feature visit http://docs.kaaproject.org/display/KAA/Endpoint+profiling.
 
 ************************************
 INSTALLATION
@@ -34,5 +34,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/datacollectiondemo/resources/projects.xml b/datacollectiondemo/resources/projects.xml
index 795df3824..f2b9176ae 100644
--- a/datacollectiondemo/resources/projects.xml
+++ b/datacollectiondemo/resources/projects.xml
@@ -216,7 +216,7 @@ For more background on the Kaa Logging subsystem, please refer to the correspond
             <![CDATA[
 This bundle contains applications that demonstrates capabilities of the Kaa Logging subsystem.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 For more background on the Kaa Logging subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
diff --git a/datacollectiondemo/source/c/README.txt b/datacollectiondemo/source/c/README.txt
index a281fcbb2..1c44e753f 100644
--- a/datacollectiondemo/source/c/README.txt
+++ b/datacollectiondemo/source/c/README.txt
@@ -19,9 +19,9 @@ PREFACE
 ************************************
 
 This demo application illustrates logging, configuration and profiling features using the Kaa C SDK.
-To read more about the logging feature visit https://docs.kaaproject.org/display/KAA/Logging.
-To read more about the configuration feature visit https://docs.kaaproject.org/display/KAA/Configuration.
-To read more about the profiling feature visit https://docs.kaaproject.org/display/KAA/Endpoint+profiling.
+To read more about the logging feature visit http://docs.kaaproject.org/display/KAA/Logging.
+To read more about the configuration feature visit http://docs.kaaproject.org/display/KAA/Configuration.
+To read more about the profiling feature visit http://docs.kaaproject.org/display/KAA/Endpoint+profiling.
 
 ************************************
 INSTALLATION
@@ -30,9 +30,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -42,5 +42,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/datacollectiondemo/source/cpp/README.txt b/datacollectiondemo/source/cpp/README.txt
index 9fc73e0f1..63d9ac5b2 100644
--- a/datacollectiondemo/source/cpp/README.txt
+++ b/datacollectiondemo/source/cpp/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa logging feature using the Kaa C++ SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Logging.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Logging.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C++ SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -40,5 +40,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/econais/ec19d/streetlight-driver/resources/projects.xml b/econais/ec19d/streetlight-driver/resources/projects.xml
index cbddcdb6c..2c90bed00 100644
--- a/econais/ec19d/streetlight-driver/resources/projects.xml
+++ b/econais/ec19d/streetlight-driver/resources/projects.xml
@@ -32,7 +32,7 @@ TODO: some description
 <h2>What's next?</h2>
 Get the source code by clicking the "Source" button on the left and start hacking!<br/><br/>
 
-For more background on Kaa data collection subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
+For more background on Kaa data collection subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
             ]]></details>
             
         <!-- Specifies the source code language of Kaa endpoint SDK which is used by this project 
diff --git a/econais/ec19d/trafficlights-driver/resources/projects.xml b/econais/ec19d/trafficlights-driver/resources/projects.xml
index f385c340a..438254698 100644
--- a/econais/ec19d/trafficlights-driver/resources/projects.xml
+++ b/econais/ec19d/trafficlights-driver/resources/projects.xml
@@ -32,7 +32,7 @@ TODO: some description
 <h2>What's next?</h2>
 Get the source code by clicking the "Source" button on the left and start hacking!<br/><br/>
 
-For more background on Kaa data collection subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
+For more background on Kaa data collection subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
             ]]></details>
             
         <!-- Specifies the source code language of Kaa endpoint SDK which is used by this project 
diff --git a/eventdemo/resources/projects.xml b/eventdemo/resources/projects.xml
index 516814d69..f950683de 100644
--- a/eventdemo/resources/projects.xml
+++ b/eventdemo/resources/projects.xml
@@ -197,7 +197,7 @@ For more background on the Kaa Event subsystem please refer to the corresponding
             <![CDATA[
 This bundle contains applications that demonstrates capabilities of the Kaa Event subsystem.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 For more background on the Kaa Event subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
diff --git a/eventdemo/source/c/README.txt b/eventdemo/source/c/README.txt
index 167f1fdda..5862fb4a3 100644
--- a/eventdemo/source/c/README.txt
+++ b/eventdemo/source/c/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa event feature using the Kaa C SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Events.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Events.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Before generating the C SDK, make sure that you provided the SDK with a user verifier and the following fields for the event class family were specified as follows:
  Name: ThermostatEventClassFamily
  Namespace: org.kaaproject.kaa.schema.sample.event.thermo
@@ -44,5 +44,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/eventdemo/source/cpp/README.txt b/eventdemo/source/cpp/README.txt
index 5c628a503..dd073ffae 100644
--- a/eventdemo/source/cpp/README.txt
+++ b/eventdemo/source/cpp/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa event feature using the Kaa C++ SDK.
-To read more about the event feature, visit https://docs.kaaproject.org/display/KAA/Events.
+To read more about the event feature, visit http://docs.kaaproject.org/display/KAA/Events.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Before generating the C++ SDK, make sure that you provided the SDK with a user verifier and the following fields for the event class family were specified as follows:
  Name: ThermostatEventClassFamily
  Namespace: org.kaaproject.kaa.schema.sample.event.thermo
@@ -43,5 +43,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/gpiocontrol/resources/projects.xml b/gpiocontrol/resources/projects.xml
index 0c604a6fa..35627a769 100644
--- a/gpiocontrol/resources/projects.xml
+++ b/gpiocontrol/resources/projects.xml
@@ -32,11 +32,11 @@ Download the .apk to your Android device by clicking the "Binary" button on the
 <h2>Playing around</h2>
 Make sure that the Kaa Sandbox is up and running. You will need to install this application on at least one Android-powered device and one ESP8266- or CC32XX-powered device.
 
-After you have configured and started the application on ESP8266 or CC32XX (You can read about its installation in “GPIO control ESP8266” and “GPIO control CC32XX” Kaa Sandbox apps), start the application on the Android device and press the "+" button on the right bottom of the screen. Enter the endpoint acess token (the default values are "cc3200" for CC3200 and "esp8266" for ESP8266). No other data is needed because <a href="https://docs.kaaproject.org/display/KAA/Attaching+endpoints+to+users#Attachingendpointstousers-Trustfuluserverifier">trustful user verifier</a> is used for demonstration purposes.<br/><br/>
+After you have configured and started the application on ESP8266 or CC32XX (You can read about its installation in “GPIO control ESP8266” and “GPIO control CC32XX” Kaa Sandbox apps), start the application on the Android device and press the "+" button on the right bottom of the screen. Enter the endpoint acess token (the default values are "cc3200" for CC3200 and "esp8266" for ESP8266). No other data is needed because <a href="http://docs.kaaproject.org/display/KAA/Attaching+endpoints+to+users#Attachingendpointstousers-Trustfuluserverifier">trustful user verifier</a> is used for demonstration purposes.<br/><br/>
 Then, click on the appeared device and try to toggle the switches.
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 <h2>What's next?</h2>
-For more background on the Kaa Event subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
+For more background on the Kaa Event subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
 ]]>
         </details>
         
@@ -168,11 +168,11 @@ $ ./build.sh
 <h2>Playing around</h2>
 Make sure that the Kaa Sandbox is up and running. You will need to install this application on at least one iOS device and one ESP8266- or CC32XX-powered device.
 
-After you have configured and started the application on ESP8266 or CC32XX (You can read about its installation in “GPIO control ESP8266” and “GPIO control CC32XX” Kaa Sandbox apps), start the application on the iOS device and press the "+" button on the right bottom of the screen. Enter the endpoint acess token (the default values are "cc3200" for CC3200 and "esp8266" for ESP8266). No other data is needed because <a href="https://docs.kaaproject.org/display/KAA/Attaching+endpoints+to+users#Attachingendpointstousers-Trustfuluserverifier">trustful user verifier</a> is used for demonstration purposes.<br/><br/>
+After you have configured and started the application on ESP8266 or CC32XX (You can read about its installation in “GPIO control ESP8266” and “GPIO control CC32XX” Kaa Sandbox apps), start the application on the iOS device and press the "+" button on the right bottom of the screen. Enter the endpoint acess token (the default values are "cc3200" for CC3200 and "esp8266" for ESP8266). No other data is needed because <a href="http://docs.kaaproject.org/display/KAA/Attaching+endpoints+to+users#Attachingendpointstousers-Trustfuluserverifier">trustful user verifier</a> is used for demonstration purposes.<br/><br/>
 Then, click on the appeared device and try to toggle the switches.
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 <h2>What's next?</h2>
-For more background on the Kaa Event subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
+For more background on the Kaa Event subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
 ]]>
         </details>
         <sdkLanguage>OBJC</sdkLanguage>
@@ -192,9 +192,9 @@ For more background on the Kaa Event subsystem please refer to the corresponding
             <![CDATA[
 This bundle contains applications that demonstrates capabilities of the Kaa Event subsystem.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 <h2>What's next?</h2>
-For more background on the Kaa Event subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
+For more background on the Kaa Event subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Messaging+across+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Events">design reference</a> sections.
 ]]>
         </details>
     </bundle>
diff --git a/gpiocontrol/source/artik5/README.txt b/gpiocontrol/source/artik5/README.txt
index 5c628a503..dd073ffae 100644
--- a/gpiocontrol/source/artik5/README.txt
+++ b/gpiocontrol/source/artik5/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa event feature using the Kaa C++ SDK.
-To read more about the event feature, visit https://docs.kaaproject.org/display/KAA/Events.
+To read more about the event feature, visit http://docs.kaaproject.org/display/KAA/Events.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Before generating the C++ SDK, make sure that you provided the SDK with a user verifier and the following fields for the event class family were specified as follows:
  Name: ThermostatEventClassFamily
  Namespace: org.kaaproject.kaa.schema.sample.event.thermo
@@ -43,5 +43,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/gpiocontrol/source/cc32xx/README.txt b/gpiocontrol/source/cc32xx/README.txt
index 62dbfc071..ba48dc682 100644
--- a/gpiocontrol/source/cc32xx/README.txt
+++ b/gpiocontrol/source/cc32xx/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa event feature using the Kaa C SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Events.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Events.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Before generating the C SDK, make sure that you provided the SDK with a user verifier and the following fields for the event class family were specified as follows:
  Name: Remote Control Event Class Family
  Namespace: org.kaaproject.kaa.examples.gpiocontrol
@@ -44,5 +44,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/gpiocontrol/source/esp8266/README.txt b/gpiocontrol/source/esp8266/README.txt
index d860cc64d..1afee7856 100644
--- a/gpiocontrol/source/esp8266/README.txt
+++ b/gpiocontrol/source/esp8266/README.txt
@@ -19,9 +19,9 @@ PREFACE
 ************************************
 
 This demo application illustrates configuration feature using the Kaa C SDK.
-To read more about the logging feature visit https://docs.kaaproject.org/display/KAA/Logging.
-To read more about the configuration feature visit https://docs.kaaproject.org/display/KAA/Configuration.
-To read more about the profiling feature visit https://docs.kaaproject.org/display/KAA/Endpoint+profiling.
+To read more about the logging feature visit http://docs.kaaproject.org/display/KAA/Logging.
+To read more about the configuration feature visit http://docs.kaaproject.org/display/KAA/Configuration.
+To read more about the profiling feature visit http://docs.kaaproject.org/display/KAA/Endpoint+profiling.
 
 ************************************
 INSTALLATION
@@ -34,5 +34,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/notificationdemo/resources/projects.xml b/notificationdemo/resources/projects.xml
index 490d85761..f57ef4a67 100644
--- a/notificationdemo/resources/projects.xml
+++ b/notificationdemo/resources/projects.xml
@@ -239,7 +239,7 @@ For more background on the Kaa Notification subsystem please refer to the corres
             <![CDATA[
 This bundle contains applications that demonstrates capabilities of the Kaa Notification subsystem.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 For more background on the Kaa Notification subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Using+notifications">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Notifications">design reference</a> sections.
diff --git a/notificationdemo/source/c/README.txt b/notificationdemo/source/c/README.txt
index f432217b3..0e945e4f1 100644
--- a/notificationdemo/source/c/README.txt
+++ b/notificationdemo/source/c/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa event feature using the Kaa C SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Notifications.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Notifications.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Before generating the C SDK, make sure that you provided the SDK with a user verifier and the following fields for the event class family were specified as follows:
  Name: ThermostatEventClassFamily
  Namespace: org.kaaproject.kaa.schema.sample.event.thermo
@@ -44,5 +44,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/notificationdemo/source/cpp/README.txt b/notificationdemo/source/cpp/README.txt
index 63ce92854..74280446d 100644
--- a/notificationdemo/source/cpp/README.txt
+++ b/notificationdemo/source/cpp/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa notification feature using the Kaa C++ SDK.
-To read more about the notification feature, visit https://docs.kaaproject.org/display/KAA/Notifications.
+To read more about the notification feature, visit http://docs.kaaproject.org/display/KAA/Notifications.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C++ SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -40,5 +40,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/ota/source/cc32xx/README.txt b/ota/source/cc32xx/README.txt
index 5b48e63a9..0758a7ae6 100644
--- a/ota/source/cc32xx/README.txt
+++ b/ota/source/cc32xx/README.txt
@@ -19,9 +19,9 @@ PREFACE
 ************************************
 
 This demo application illustrates configuration feature using the Kaa C SDK.
-To read more about the logging feature visit https://docs.kaaproject.org/display/KAA/Logging.
-To read more about the configuration feature visit https://docs.kaaproject.org/display/KAA/Configuration.
-To read more about the profiling feature visit https://docs.kaaproject.org/display/KAA/Endpoint+profiling.
+To read more about the logging feature visit http://docs.kaaproject.org/display/KAA/Logging.
+To read more about the configuration feature visit http://docs.kaaproject.org/display/KAA/Configuration.
+To read more about the profiling feature visit http://docs.kaaproject.org/display/KAA/Endpoint+profiling.
 
 ************************************
 INSTALLATION
@@ -31,7 +31,7 @@ To run the demo application, do the following:
 
 1. Install environment to build the Kaa C SDK.
 http://docs.kaaproject.org/display/KAA/Texas+Instruments+CC3200
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'build' option).
@@ -43,5 +43,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/powerplant-android/resources/projects.xml b/powerplant-android/resources/projects.xml
index d59aa0e53..0cb9cd7d6 100644
--- a/powerplant-android/resources/projects.xml
+++ b/powerplant-android/resources/projects.xml
@@ -32,7 +32,7 @@ Download the .apk to your Android device by clicking the "Binary" button on the
 <h2>What's next?</h2>
 Get the source code by clicking the "Source" button on the left and start hacking!<br/><br/>
 
-For more background on user verification refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Attaching+endpoints+to+users#Attachingendpointstousers-Userverifiers">design reference</a> section. It is also possible to implement custom user verifier using <a href="https://docs.kaaproject.org/display/KAA/Creating+custom+user+verifier">programming guide</a>.
+For more background on user verification refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Attaching+endpoints+to+users#Attachingendpointstousers-Userverifiers">design reference</a> section. It is also possible to implement custom user verifier using <a href="http://docs.kaaproject.org/display/KAA/Creating+custom+user+verifier">programming guide</a>.
             ]]>
         </details>
         
diff --git a/powerplant/resources/projects.xml b/powerplant/resources/projects.xml
index 3c2c14a71..5bc8528a0 100644
--- a/powerplant/resources/projects.xml
+++ b/powerplant/resources/projects.xml
@@ -32,7 +32,7 @@ This simple app demonstrates Kaa data collection subsystem and data distributing
 <h2>What's next?</h2>
 Get the source code by clicking the "Source" button on the left and start hacking!<br/><br/>
 
-For more background on Kaa data collection subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
+For more background on Kaa data collection subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
             ]]></details>
         
         <!-- Specifies the source code language of Kaa endpoint SDK which is used by this project 
diff --git a/powerplant/source/cpp/README.txt b/powerplant/source/cpp/README.txt
index a7610e98a..449892f87 100644
--- a/powerplant/source/cpp/README.txt
+++ b/powerplant/source/cpp/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa logging feature using the Kaa C++ SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Logging.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Logging.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C++ SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'resources' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -40,5 +40,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/sparkdemo/source/cpp/README b/sparkdemo/source/cpp/README
index bb44675ef..09c0eeb46 100644
--- a/sparkdemo/source/cpp/README
+++ b/sparkdemo/source/cpp/README
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa logging feature using the Kaa C++ SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Logging.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Logging.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C++ SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -40,4 +40,4 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
diff --git a/stormdemo/resources/projects.xml b/stormdemo/resources/projects.xml
index 7dc594a91..425ab6e8b 100644
--- a/stormdemo/resources/projects.xml
+++ b/stormdemo/resources/projects.xml
@@ -230,7 +230,7 @@ the endpoint in your server side application.
             <![CDATA[
 This bundle contains applications that demonstrate real-time data processing in Apache Storm using Kaa platform.
 
-Please note that all the features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported via the <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all the features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported via the <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 For more background on the Kaa Logging subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
diff --git a/stormdemo/source/c/README b/stormdemo/source/c/README
index ef74ffc59..ebe837869 100644
--- a/stormdemo/source/c/README
+++ b/stormdemo/source/c/README
@@ -19,9 +19,9 @@ PREFACE
 ************************************
 
 This demo application illustrates logging, configuration and profiling features using the Kaa C SDK.
-To read more about the logging feature visit https://docs.kaaproject.org/display/KAA/Logging.
-To read more about the configuration feature visit https://docs.kaaproject.org/display/KAA/Configuration.
-To read more about the profiling feature visit https://docs.kaaproject.org/display/KAA/Endpoint+profiling.
+To read more about the logging feature visit http://docs.kaaproject.org/display/KAA/Logging.
+To read more about the configuration feature visit http://docs.kaaproject.org/display/KAA/Configuration.
+To read more about the profiling feature visit http://docs.kaaproject.org/display/KAA/Endpoint+profiling.
 
 ************************************
 INSTALLATION
@@ -30,9 +30,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -42,5 +42,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 
diff --git a/stormdemo/source/cpp/README b/stormdemo/source/cpp/README
index 67bdd5b6f..bfba12f59 100644
--- a/stormdemo/source/cpp/README
+++ b/stormdemo/source/cpp/README
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa logging feature using the Kaa C++ SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Logging.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Logging.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C++ SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'avro' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -40,4 +40,4 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
diff --git a/vehicletelemetry/resources/projects.xml b/vehicletelemetry/resources/projects.xml
index 987a19ce7..edbdd0394 100644
--- a/vehicletelemetry/resources/projects.xml
+++ b/vehicletelemetry/resources/projects.xml
@@ -28,10 +28,10 @@
 This simple app demonstrates Kaa data collection subsystem capabilities on C++ SDK.
 
 <h2>Installation</h2>
-Download the source code by clicking the "Source" button on the left. Build the source code using endpoint build and integration <a href="https://docs.kaaproject.org/display/KAA/Endpoint+build+and+integration+instructions#Endpointbuildandintegrationinstructions-BuildingC++endpointSDK">instructions</a>.
+Download the source code by clicking the "Source" button on the left. Build the source code using endpoint build and integration <a href="http://docs.kaaproject.org/display/KAA/Endpoint+build+and+integration+instructions#Endpointbuildandintegrationinstructions-BuildingC++endpointSDK">instructions</a>.
 
 <h2>Playing around</h2>
-Make sure that the Kaa sandbox is up and running. Starting the "Data collection demo" app, you will trigger delivery of five log messages to Kaa cluster. Kaa cluster will write this messages to local MongoDB database using <a href="https://docs.kaaproject.org/display/KAA/Log+appenders#Logappenders-MongoDBlogappender">MongoDB appender</a>.
+Make sure that the Kaa sandbox is up and running. Starting the "Data collection demo" app, you will trigger delivery of five log messages to Kaa cluster. Kaa cluster will write this messages to local MongoDB database using <a href="http://docs.kaaproject.org/display/KAA/Log+appenders#Logappenders-MongoDBlogappender">MongoDB appender</a>.
 You can explore collected data by querying sandbox MongoDB instance:
 <pre>
 $ mongo kaa
@@ -40,14 +40,14 @@ db.logs_$your_application_token$.find()
 
 Where $your_application_token$ is the application token you can copy from the main application page of the Administrative UI.<br/><br/>
 
-Now it's time to test things out: navigate to the Kaa server administrative interface by clicking on the "Administrative console" link from the Sandbox screen. Log in as a tenant developer (devuser / devuser123), and navigate to the "Data collection demo" application, then select "Log appenders". From here you can <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide#AdministrationUIguide-Logappenders">manage log appenders</a>. Do not forget to activate updated configuration - otherwise the endpoint will not be able to see it. Make sure you have tried creating Flume or Cassandra log appenders!<br/><br/>
+Now it's time to test things out: navigate to the Kaa server administrative interface by clicking on the "Administrative console" link from the Sandbox screen. Log in as a tenant developer (devuser / devuser123), and navigate to the "Data collection demo" application, then select "Log appenders". From here you can <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide#AdministrationUIguide-Logappenders">manage log appenders</a>. Do not forget to activate updated configuration - otherwise the endpoint will not be able to see it. Make sure you have tried creating Flume or Cassandra log appenders!<br/><br/>
 
-Please note that all features of <a href="https://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="https://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
+Please note that all features of <a href="http://docs.kaaproject.org/display/KAA/Administration+UI+guide">Administrative UI</a> are also supported by <a href="http://docs.kaaproject.org/display/KAA/Admin+REST+API">REST API</a>.
 
 <h2>What's next?</h2>
 Get the source code by clicking the "Source" button on the left and start hacking!<br/><br/>
 
-For more background on Kaa data collection subsystem please refer to the corresponding <a href="https://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="https://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
+For more background on Kaa data collection subsystem please refer to the corresponding <a href="http://docs.kaaproject.org/display/KAA/Collecting+data+from+endpoints">programming guide</a> and <a href="http://docs.kaaproject.org/display/KAA/Logging">design reference</a> sections.
             ]]></details>
             
         <!-- Specifies the source code language of Kaa endpoint SDK which is used by this project 
diff --git a/vehicletelemetry/source/cpp/README.txt b/vehicletelemetry/source/cpp/README.txt
index a7610e98a..449892f87 100644
--- a/vehicletelemetry/source/cpp/README.txt
+++ b/vehicletelemetry/source/cpp/README.txt
@@ -19,7 +19,7 @@ PREFACE
 ************************************
 
 This demo application illustrates the Kaa logging feature using the Kaa C++ SDK.
-To read more about the logging feature, visit https://docs.kaaproject.org/display/KAA/Logging.
+To read more about the logging feature, visit http://docs.kaaproject.org/display/KAA/Logging.
 
 ************************************
 INSTALLATION
@@ -28,9 +28,9 @@ INSTALLATION
 To run the demo application, do the following:
 
 1. Install third-party libraries to build the Kaa C++ SDK.
-Follow https://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
+Follow http://docs.kaaproject.org/display/KAA/Third-party+components#Third-partycomponents-Kaaendpoint to see the full
 list of third-party dependencies for the Kaa C++ SDK.
-2. Download and install the Kaa sandbox (https://docs.kaaproject.org/display/KAA/sandbox).
+2. Download and install the Kaa sandbox (http://docs.kaaproject.org/display/KAA/sandbox).
 3. Generate the C++ SDK using the Kaa sandbox. The Avro log schema required for the demo application is located in 
 the 'resources' directory. Put the SDK archive into the 'libs/kaa' directory.
 4. Use the build.sh script to build and run the demo application (the 'deploy' option).
@@ -40,5 +40,5 @@ ABOUT
 ************************************
 
 If you are interested in the Kaa IoT framework and want to read more about it, visit our official site
-http://www.kaaproject.org/. The documentation can be found at https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
+http://www.kaaproject.org/. The documentation can be found at http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home.
 

From f9b5dc6f5b4adcd8442687dfc18fa137b94e15fe Mon Sep 17 00:00:00 2001
From: Max Payne <forgge@gmail.com>
Date: Fri, 1 Apr 2016 20:59:09 +0300
Subject: [PATCH 14/42] APP-59 CC32xx application build fixes

Now toolchain and SDK can be picked up from environment
with non-default path. Correct dependencies are specified as
well. Target-related modules separated in preparation to APP-63
---
 gpiocontrol/source/cc32xx/CMakeLists.txt      | 48 +++++++----
 gpiocontrol/source/cc32xx/build.sh            | 83 ++++++++++---------
 gpiocontrol/source/cc32xx/cc32xx/cc32xx.cmake | 70 ----------------
 gpiocontrol/source/cc32xx/src/kaa_demo.c      | 83 +++++++------------
 .../cc32xx/targets/cc32xx/CMakeLists.txt      | 72 ++++++++++++++++
 .../source/cc32xx/{ => targets}/cc32xx/app.ld |  0
 .../{ => targets}/cc32xx/cc32xx_support.c     | 52 +++++++++++-
 .../cc32xx/target.h}                          | 38 ++-------
 8 files changed, 237 insertions(+), 209 deletions(-)
 delete mode 100644 gpiocontrol/source/cc32xx/cc32xx/cc32xx.cmake
 create mode 100644 gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
 rename gpiocontrol/source/cc32xx/{ => targets}/cc32xx/app.ld (100%)
 rename gpiocontrol/source/cc32xx/{ => targets}/cc32xx/cc32xx_support.c (88%)
 rename gpiocontrol/source/cc32xx/{cc32xx/cc32xx_support.h => targets/cc32xx/target.h} (59%)

diff --git a/gpiocontrol/source/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/CMakeLists.txt
index b221d1ed7..80fbe7e17 100644
--- a/gpiocontrol/source/cc32xx/CMakeLists.txt
+++ b/gpiocontrol/source/cc32xx/CMakeLists.txt
@@ -12,32 +12,44 @@
 #  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.
-#
 
 cmake_minimum_required(VERSION 2.8.8)
 
-project (C-SDK-sample)
+project(C-SDK-sample)
 enable_language(C)
 
-if(KAA_PLATFORM STREQUAL "" OR KAA_PLATFORM STREQUAL "x86-64")
-  set(KAA_PLATFORM "x86-64")
-  find_package (OpenSSL REQUIRED)
-  set(APP_LIBS kaac_s crypto)
-  set(SAMPLE_SOURCE_FILES
-            src/kaa_demo.c 
-     )
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/build)
+# Target-independent flags.
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
+
+# TODO: (KAA-858) Remove it after issue will be resolved
+if(KAA_DEBUG_ENABLED)
+    set(CMAKE_BUILD_TYPE "Debug")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0")
 else()
-  include(${CMAKE_CURRENT_SOURCE_DIR}/${KAA_PLATFORM}/${KAA_PLATFORM}.cmake)
+    set(CMAKE_BUILD_TYPE "MinSizeRel")
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -g -Wall -Wextra -DSSID='\"${SSID}\"' -DPWD='\"${PWD}\"' -DDEMO_ACCESS_TOKEN='\"${DEMO_ACCESS_TOKEN}\"' ")
+# Our application name.
+set(APP_NAME demo_client)
+
+# List of additional libraries depends on target chosen.
+set(ADDITIONAL_LIBS)
+
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src
-                    ${CMAKE_CURRENT_SOURCE_DIR}/libs/kaa/src
-                   )
+# Path to the Kaa SDK.
+add_subdirectory(libs/kaa)
+# Directory containing target support library.
+add_subdirectory(targets/${KAA_TARGET})
 
-add_executable(${APP_NAME} ${SAMPLE_SOURCE_FILES})
-target_link_libraries(${APP_NAME} ${APP_LIBS})
+# Demo executable.
+add_executable(${APP_NAME} src/kaa_demo.c)
+
+# All libraries that demo app depends on.
+target_link_libraries(${APP_NAME} kaac_s target_support ${APP_LIBS})
+
+# For most embedded targets binary stripping is required.
+if(${KAA_PRODUCE_BINARY})
+  add_custom_command(TARGET ${APP_NAME} POST_BUILD
+          COMMAND ${CMAKE_OBJCOPY} -O binary ${APP_NAME} ${APP_NAME}.bin)
+endif()
 
-add_custom_command(TARGET ${APP_NAME} POST_BUILD COMMAND ${CMAKE_OBJCOPY} -O binary ${APP_NAME}.afx ${APP_NAME}.bin)
diff --git a/gpiocontrol/source/cc32xx/build.sh b/gpiocontrol/source/cc32xx/build.sh
index 7414e0c57..03c1a8c9b 100755
--- a/gpiocontrol/source/cc32xx/build.sh
+++ b/gpiocontrol/source/cc32xx/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 #  Copyright 2014-2016 CyberVision, Inc.
 #
@@ -15,17 +15,23 @@
 #  limitations under the License.
 #
 
+# TODO APP-63: this file must be reviewed and moved to common build script dir
+
+
+# Exit immediately if error occurs
+set -e
 
 RUN_DIR=`pwd`
 
-function help {
+help_message() {
     echo "Choose one of the following: {build|run|deploy|clean}"
+    echo "Supported targets: cc32xx" # TODO APP-63: extend these
     exit 1
 }
 
 if [ $# -eq 0 ]
 then
-    help
+    help_message
 fi
 
 APP_NAME="demo_client"
@@ -36,10 +42,12 @@ KAA_LIB_PATH="$LIBS_PATH/kaa"
 KAA_C_LIB_HEADER_PATH="$KAA_LIB_PATH/src"
 KAA_CPP_LIB_HEADER_PATH="$KAA_LIB_PATH/kaa"
 KAA_SDK_TAR="kaa-c*.tar.gz"
+KAA_TOOLCHAIN_PATH_SDK=""
+# TODO APP-63: comment about inconvenience between KAA_TARGET and KAA_PLATFORM
+KAA_TARGET=cc32xx
+KAA_PRODUCE_BINARY=1
+DEMO_ACCESS_TOKEN=
 
-#Wifi settings
-SSID="xxx"
-PASSWORD="xxxxxxxxx"
 
 if [ -z ${DEMO_ACCESS_TOKEN} ]; then
     DEMO_ACCESS_TOKEN=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 6 | head -n 1)
@@ -48,8 +56,9 @@ echo "==================================="
 echo " ACCESS TOKEN: " $DEMO_ACCESS_TOKEN
 echo "==================================="
 
-function build_thirdparty {
-    if [[ ! -d "$KAA_C_LIB_HEADER_PATH" &&  ! -d "$KAA_CPP_LIB_HEADER_PATH" ]]
+
+unpack_sdk() {
+    if [ ! -d "$KAA_C_LIB_HEADER_PATH"  -a ! -d "$KAA_CPP_LIB_HEADER_PATH" ]
     then
         KAA_SDK_TAR_NAME=$(find $PROJECT_HOME -iname $KAA_SDK_TAR)
 
@@ -59,61 +68,57 @@ function build_thirdparty {
             exit 1
         fi
 
-        mkdir -p $KAA_LIB_PATH &&
+        mkdir -p $KAA_LIB_PATH
         tar -zxf $KAA_SDK_TAR_NAME -C $KAA_LIB_PATH
     fi
+}
 
-    if [ ! -d "$KAA_LIB_PATH/$BUILD_DIR" ]
-    then
-        cd $KAA_LIB_PATH &&
-        mkdir -p $BUILD_DIR && cd $BUILD_DIR
-
-        ENV_VAR=" -DKAA_PLATFORM=cc32xx \
-        -DCMAKE_TOOLCHAIN_FILE=../toolchains/cc32xx.cmake \
-        -DKAA_MAX_LOG_LEVEL=3"
+build_app() {
+    # Wifi settings
+    SSID=
+    PASSWORD=
 
+    ENV_VAR=" -DKAA_PLATFORM=cc32xx -DAPP_NAME=$APP_NAME"
         if [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
-            ENV_VAR=$ENV_VAR" -DKAA_TOOLCHAIN_PATH=c:/cygwin/opt/kaa"
+                ENV_VAR=$ENV_VAR" -DKAA_TOOLCHAIN_PATH=c:/cygwin/opt/kaa"
         fi
 
-        cmake -G "Unix Makefiles" $ENV_VAR ..
-    fi
-
-    cd "$PROJECT_HOME/$KAA_LIB_PATH/$BUILD_DIR"
-    make -j4 &&
     cd $PROJECT_HOME
-}
+    mkdir -p "$PROJECT_HOME/$BUILD_DIR"
+    cd $BUILD_DIR
 
-function build_app {
     echo "Enter WiFi SSID:"
     read SSID
     echo "Enter WiFi Password:"
     read PASSWORD
-    cd $PROJECT_HOME &&
-    mkdir -p "$PROJECT_HOME/$BUILD_DIR" &&
-    cp "$KAA_LIB_PATH/$BUILD_DIR/"libkaa* "$PROJECT_HOME/$BUILD_DIR/" &&
-    cd $BUILD_DIR
-    ENV_VAR=" -DKAA_PLATFORM=cc32xx -DAPP_NAME=$APP_NAME"
-        if [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
-                ENV_VAR=$ENV_VAR" -DKAA_TOOLCHAIN_PATH=c:/cygwin/opt/kaa"
-        fi
 
-    cmake -G "Unix Makefiles" -DSSID=$SSID -DPWD=$PASSWORD -DDEMO_ACCESS_TOKEN=$DEMO_ACCESS_TOKEN $ENV_VAR .. &&
+    KAA_TOOLCHAIN_PATH_SDK="-DCMAKE_TOOLCHAIN_FILE=$KAA_LIB_PATH/toolchains/cc32xx.cmake"
+
+    # TODO: comments about KAA_PLATFORM and KAA_TARGET
+    cmake -DKAA_PLATFORM=$KAA_TARGET \
+          -DKAA_TARGET=$KAA_TARGET \
+          -DKAA_PRODUCE_BINARY=$KAA_PRODUCE_BINARY \
+          -DWIFI_SSID=$SSID \
+          -DWIFI_PASSWORD=$PASSWORD \
+          -DKAA_MAX_LOG_LEVEL=3 \
+          -DDEMO_ACCESS_TOKEN=$DEMO_ACCESS_TOKEN \
+          -DKAA_DEBUG_ENABLED=true \
+          ${KAA_TOOLCHAIN_PATH_SDK} ..
     make
 }
 
-function clean {
+clean() {
     rm -rf "$KAA_LIB_PATH/$BUILD_DIR"
     rm -rf "$PROJECT_HOME/$BUILD_DIR"
 }
 
-function run {
+run() {
     echo "To run demo, please have a look at http://docs.kaaproject.org/display/KAA/Texas+Instruments+CC3200#TexasInstrumentsCC3200-Example"
 }
 
 case "$1" in
     build)
-        build_thirdparty &&
+        unpack_sdk
         build_app
     ;;
 
@@ -123,7 +128,7 @@ case "$1" in
 
     deploy)
         clean
-        build_thirdparty
+        unpack_sdk
         build_app
         run
         ;;
@@ -133,6 +138,6 @@ case "$1" in
     ;;
 
     *)
-        help
+        help_message
     ;;
 esac
diff --git a/gpiocontrol/source/cc32xx/cc32xx/cc32xx.cmake b/gpiocontrol/source/cc32xx/cc32xx/cc32xx.cmake
deleted file mode 100644
index d2fac5b29..000000000
--- a/gpiocontrol/source/cc32xx/cc32xx/cc32xx.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  Copyright 2014-2016 CyberVision, Inc.
-#
-#  Licensed 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.
-#
-
-if(NOT DEFINED KAA_TOOLCHAIN_PATH)
-  set(KAA_ARM_TOOLCHAIN "/opt/kaa/gcc-arm-none-eabi")
-  set(CC32XX_SDK "/opt/kaa/cc3200-sdk")
-else()
-  set(KAA_ARM_TOOLCHAIN "${KAA_TOOLCHAIN_PATH}/gcc-arm-none-eabi")
-  set(CC32XX_SDK "${KAA_TOOLCHAIN_PATH}/cc3200-sdk")
-endif()
-
-message("## Kaa arm toolchain path: " ${KAA_ARM_TOOLCHAIN})
-message("## CC32XX SDK path: " ${CC32XX_SDK})
-
-set(CMAKE_C_COMPILER   "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-gcc")
-set(CMAKE_CXX_COMPILER "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-g++")
-set(CMAKE_AR           "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-ar")
-set(CMAKE_LINKER       "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-ld")
-set(CMAKE_OBJCOPY      "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-objcopy")
-set(CMAKE_OBJDUMP      "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-objdump")
-set(CMAKE_NM           "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-nm")
-set(CMAKE_RANLIB       "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-ranlib")
-set(CMAKE_STRIP        "${KAA_ARM_TOOLCHAIN}/bin/arm-none-eabi-strip")
-
-set(CMAKE_C_FLAGS "-mthumb -mcpu=cortex-m4 -ffunction-sections -fdata-sections -MD -O0 "  CACHE STRING "" FORCE)
-
-set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
-set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
-
-add_definitions(-Dgcc -DCC32XX -DUSER_INPUT_ENABLE)
-
-include_directories(${CC32XX_SDK}/inc)
-include_directories(${CC32XX_SDK}/driverlib)
-include_directories(${CC32XX_SDK}/simplelink)
-include_directories(${CC32XX_SDK}/simplelink/include)
-include_directories(${CC32XX_SDK}/simplelink/source)
-include_directories(${CC32XX_SDK}/example/common)
-
-set(LIB_KAA ${CMAKE_CURRENT_SOURCE_DIR}/build/libkaac_s.a)
-set(LIB_DRIVER ${CC32XX_SDK}/driverlib/gcc/exe/libdriver.a)
-set(LIB_SIMPLELINK_NONOS ${CC32XX_SDK}/simplelink/gcc/exe/libsimplelink_nonos.a)
-set(LIB_GCC ${KAA_ARM_TOOLCHAIN}/lib/gcc/arm-none-eabi/4.9.3/armv7e-m/libgcc.a)
-set(LIB_C ${KAA_ARM_TOOLCHAIN}/arm-none-eabi/lib/armv7e-m/libc.a)
-set(LIB_M ${KAA_ARM_TOOLCHAIN}/arm-none-eabi/lib/armv7e-m/libm.a)
-
-set(APP_LIBS ${LIB_KAA} ${LIB_SIMPLELINK_NONOS} ${LIB_DRIVER} ${LIB_M} ${LIB_C} ${LIB_GCC})
-
-set (SAMPLE_SOURCE_FILES
-        src/kaa_demo.c           
-        ${KAA_PLATFORM}/${KAA_PLATFORM}_support.c
-	${CC32XX_SDK}/example/common/uart_if.c
-	${CC32XX_SDK}/example/common/udma_if.c
-        ${CC32XX_SDK}/example/common/gpio_if.c
-	${CC32XX_SDK}/example/common/startup_gcc.c 
-    )
-
-set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_LINKER} -T ${CMAKE_CURRENT_SOURCE_DIR}/${KAA_PLATFORM}/app.ld --entry ResetISR --gc-sections -o ${APP_NAME}.afx <OBJECTS> <LINK_LIBRARIES>")
diff --git a/gpiocontrol/source/cc32xx/src/kaa_demo.c b/gpiocontrol/source/cc32xx/src/kaa_demo.c
index 9015ec966..3790192d3 100644
--- a/gpiocontrol/source/cc32xx/src/kaa_demo.c
+++ b/gpiocontrol/source/cc32xx/src/kaa_demo.c
@@ -28,23 +28,9 @@
 #include <kaa/gen/kaa_remote_control_ecf.h>
 #include <kaa/kaa_profile.h>
 
-#ifdef CC32XX
-#include "../cc32xx/cc32xx_support.h"
+#include "target.h"
 
-#define KAA_DEMO_RETURN_IF_ERROR(error, message) \
-    if ((error)) { \
-        UART_PRINT(message ", error code %d\r\n", (error)); \
-        return (error); \
-    }
-#define DEMO_LOG(msg, ...) UART_PRINT(msg "\r", ##__VA_ARGS__);
-#else
-#define KAA_DEMO_RETURN_IF_ERROR(error, message) \
-    if ((error)) { \
-        printf(message ", error code %d\n", (error)); \
-        return (error); \
-    }
-#define DEMO_LOG(msg, ...) printf(msg, ##__VA_ARGS__);
-#endif
+// TODO APP-63: abstract gpio functions into separate target driver
 
 static kaa_client_t *kaa_client = NULL;
 static bool is_shutdown = false;
@@ -52,8 +38,6 @@ static bool is_shutdown = false;
 static int gpio_led[] = { 0, 0, 0 };
 static int led_number = sizeof (gpio_led) / sizeof (int);
 
-#define KAA_DEMO_UNUSED(x) (void)(x);
-
 /*
  * Event callback-s.
  */
@@ -62,8 +46,8 @@ void kaa_device_info_request(void *context
                            , kaa_remote_control_ecf_device_info_request_t *event
                            , kaa_endpoint_id_p source)
 {
-    KAA_DEMO_UNUSED(context);
-    KAA_DEMO_UNUSED(source);
+    (void)context;
+    (void)source;
 
     kaa_remote_control_ecf_device_info_response_t *response = kaa_remote_control_ecf_device_info_response_create();
 
@@ -89,8 +73,8 @@ void kaa_GPIOToggle_info_request(void *context
                               , kaa_remote_control_ecf_gpio_toggle_request_t *event
                               , kaa_endpoint_id_p source)
 {
-    KAA_DEMO_UNUSED(context);
-    KAA_DEMO_UNUSED(source);
+    (void)context;
+    (void)source;
 
     if (event->gpio->status) {
         GPIO_IF_LedOn(MCU_RED_LED_GPIO + event->gpio->id);
@@ -103,60 +87,55 @@ void kaa_GPIOToggle_info_request(void *context
     event->destroy(event);
 }
 
-int main(/*int argc, char *argv[]*/)
+int main(void)
 {
-#ifdef CC32XX
-    BoardInit();
-
-    MAP_PRCMPeripheralClkEnable(PRCM_GPIOA1, PRCM_RUN_MODE_CLK);
-    MAP_PinTypeGPIO(PIN_64, PIN_MODE_0, false);
-    MAP_GPIODirModeSet(GPIOA1_BASE, 0x2, GPIO_DIR_MODE_OUT);
-    MAP_PinTypeGPIO(PIN_01, PIN_MODE_0, false);
-    MAP_GPIODirModeSet(GPIOA1_BASE, 0x4, GPIO_DIR_MODE_OUT);
-    MAP_PinTypeGPIO(PIN_02, PIN_MODE_0, false);
-    MAP_GPIODirModeSet(GPIOA1_BASE, 0x8, GPIO_DIR_MODE_OUT);
-    GPIO_IF_LedConfigure(LED1|LED2|LED3);
-    GPIO_IF_LedOff(MCU_ALL_LED_IND);
-
-    wlan_configure();
-    sl_Start(0, 0, 0);
-    wlan_connect(SSID, PWD, SL_SEC_TYPE_WPA_WPA2);
-#endif
-    DEMO_LOG("Event demo started\n");
+
+    int rc = target_initialise();
+    if (rc < 0) {
+        return 1;
+    }
+
+    demo_printf("GPIO demo started\n");
 
     /**
      * Initialize Kaa client.
      */
     kaa_error_t error_code = kaa_client_create(&kaa_client, NULL);
-    KAA_DEMO_RETURN_IF_ERROR(error_code, "Failed create Kaa client");
+    if (error_code) {
+        demo_printf("Failed to create client context: %i\n", error_code);
+        return 2;
+    }
 
     error_code = kaa_profile_manager_set_endpoint_access_token(kaa_client_get_context(kaa_client)->profile_manager, DEMO_ACCESS_TOKEN);
-
-    KAA_RETURN_IF_ERR(error_code);
+    if (error_code) {
+        demo_printf("Failed to set access token: %i\n", error_code);
+        return 3;
+    }
 
 
     error_code = kaa_event_manager_set_kaa_remote_control_ecf_device_info_request_listener(kaa_client_get_context(kaa_client)->event_manager
                                                                                          , &kaa_device_info_request
                                                                                          , NULL);
-    KAA_RETURN_IF_ERR(error_code);
-
-    error_code = kaa_event_manager_set_kaa_remote_control_ecf_gpio_toggle_request_listener(kaa_client_get_context(kaa_client)->event_manager
-                                                                                         , &kaa_GPIOToggle_info_request
-                                                                                         , NULL);
-    KAA_RETURN_IF_ERR(error_code);
+    if (error_code) {
+        demo_printf("Unable to set remote control listener: %i\n", error_code);
+        return 4;
+    }
 
     /**
      * Start Kaa client main loop.
      */
     error_code = kaa_client_start(kaa_client, NULL, NULL, 0);
-    KAA_DEMO_RETURN_IF_ERROR(error_code, "Failed to start Kaa main loop");
+    if (error_code) {
+        demo_printf("Unable to start Kaa client: %i\n", error_code);
+        return 5;
+    }
 
     /**
      * Destroy Kaa client.
      */
     kaa_client_destroy(kaa_client);
 
-    DEMO_LOG("Event demo stopped\n");
+    demo_printf("GPIO demo stopped\n");
 
     return error_code;
 }
diff --git a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
new file mode 100644
index 000000000..e2430dec4
--- /dev/null
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
@@ -0,0 +1,72 @@
+# TODO APP-63: this file must be reviewed and moved to common targets dir
+
+# Before this module is added, SDK path must be provided
+if(NOT EXISTS "${CC32XX_SDK}")
+    message(FATAL_ERROR "CC32XX SDK path: ${CC32XX_SDK} not exist!")
+endif()
+
+# Target support library that provides abstractions for cc32xx target.
+add_library(target_support
+        STATIC
+        # Example files contains startup routine and other useful stuff.
+        ${CC32XX_SDK}/example/common/uart_if.c
+        ${CC32XX_SDK}/example/common/udma_if.c
+        ${CC32XX_SDK}/example/common/gpio_if.c
+        ${CC32XX_SDK}/example/common/startup_gcc.c
+        cc32xx_support.c
+        )
+
+target_include_directories(target_support PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+# CC32XX SDK libraries
+
+set(LIB_DRIVER ${CC32XX_SDK}/driverlib/gcc/exe/libdriver.a)
+set(LIB_SIMPLELINK_NONOS ${CC32XX_SDK}/simplelink/gcc/exe/libsimplelink_nonos.a)
+set(CC32XX_SDK_LIBS ${LIB_SIMPLELINK_NONOS} ${LIB_DRIVER})
+
+target_include_directories(target_support
+        PUBLIC
+        ${CC32XX_SDK}/inc
+        ${CC32XX_SDK}/driverlib
+        ${CC32XX_SDK}/simplelink
+        ${CC32XX_SDK}/simplelink/include
+        ${CC32XX_SDK}/simplelink/source
+        ${CC32XX_SDK}/example/common)
+
+# Find and use ARM GCC libraries, provided that CMAKE_FIND_ROOT_PATH is properly set
+
+find_library(LIB_C_PATH
+        NAMES c libc
+        PATHS /lib/armv7e-m/
+        NO_DEFAULT_PATH)
+
+find_library(LIB_M_PATH
+        NAMES m libm
+        PATHS /lib/armv7e-m/
+        NO_DEFAULT_PATH)
+
+# TODO: find more elegant solution to support different versions of the gcc library
+# Rather than listing versions dirs in PATH_SUFFIXES variables
+find_library(LIB_GCC_PATH
+        NAMES gcc
+        PATHS "${TOOLCHAIN_PATH}/lib/gcc/arm-none-eabi/"
+        PATH_SUFFIXES 5.3.0/armv7e-m/ 4.9.3/armv7e-m/
+        NO_DEFAULT_PATH
+        NO_CMAKE_FIND_ROOT_PATH)
+
+# GCC dependencies
+target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH})
+# CC32XX dependencies
+target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS})
+# Propagate linker script
+target_link_libraries(target_support PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/app.ld)
+
+message("WiFi AP: ${WIFI_SSID}")
+message("WiFi Pass: ${WIFI_PASSWORD}")
+
+# Expose WiFi credentials
+target_compile_definitions(target_support
+        PUBLIC
+        -DWIFI_SSID="${WIFI_SSID}"
+        -DWIFI_PASSWORD="${WIFI_PASSWORD}"
+        -DDEMO_ACCESS_TOKEN="${DEMO_ACCESS_TOKEN}")
\ No newline at end of file
diff --git a/gpiocontrol/source/cc32xx/cc32xx/app.ld b/gpiocontrol/source/cc32xx/targets/cc32xx/app.ld
similarity index 100%
rename from gpiocontrol/source/cc32xx/cc32xx/app.ld
rename to gpiocontrol/source/cc32xx/targets/cc32xx/app.ld
diff --git a/gpiocontrol/source/cc32xx/cc32xx/cc32xx_support.c b/gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c
similarity index 88%
rename from gpiocontrol/source/cc32xx/cc32xx/cc32xx_support.c
rename to gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c
index 3895232c9..4999ed628 100644
--- a/gpiocontrol/source/cc32xx/cc32xx/cc32xx_support.c
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c
@@ -14,8 +14,40 @@
  *  limitations under the License.
  */
 
+// TODO APP-63: this file must be reviewed
+
 #include <time.h>
-#include "cc32xx_support.h"
+#include "target.h"
+
+
+/* Avoid redifined warning */
+#undef FD_SETSIZE
+#undef FD_SET
+#undef FD_CLR
+#undef FD_ISSET
+#undef FD_ZERO
+#undef fd_set
+
+#include "hw_types.h"
+#include "hw_ints.h"
+#include "hw_memmap.h"
+#include "hw_common_reg.h"
+#include "rom.h"
+#include "rom_map.h"
+#include "interrupt.h"
+#include "hw_apps_rcm.h"
+#include "prcm.h"
+#include "common.h"
+#include "uart.h"
+#include "gpio.h"
+#include "gpio_if.h"
+#include "uart_if.h"
+#include "udma_if.h"
+#include "pin.h"
+
+#include "common.h"
+
+#include "simplelink.h"
 
 #define DEMO_UNUSED(x) if(x){}
 
@@ -291,3 +323,21 @@ void net_ping(const char *host)
     while(!IS_PING_DONE(g_ulStatus))
         _SlNonOsMainLoopTask();
 }
+
+int target_initialise()
+{
+    BoardInit();
+    MAP_PRCMPeripheralClkEnable(PRCM_GPIOA1, PRCM_RUN_MODE_CLK);
+    MAP_PinTypeGPIO(PIN_64, PIN_MODE_0, false);
+    MAP_GPIODirModeSet(GPIOA1_BASE, 0x2, GPIO_DIR_MODE_OUT);
+    MAP_PinTypeGPIO(PIN_01, PIN_MODE_0, false);
+    MAP_GPIODirModeSet(GPIOA1_BASE, 0x4, GPIO_DIR_MODE_OUT);
+    MAP_PinTypeGPIO(PIN_02, PIN_MODE_0, false);
+    MAP_GPIODirModeSet(GPIOA1_BASE, 0x8, GPIO_DIR_MODE_OUT);
+    GPIO_IF_LedConfigure(LED1|LED2|LED3);
+    GPIO_IF_LedOff(MCU_ALL_LED_IND);
+
+    wlan_configure();
+    //sl_Start(0, 0, 0);
+    wlan_connect(WIFI_SSID, WIFI_PASSWORD, SL_SEC_TYPE_WPA_WPA2);
+}
\ No newline at end of file
diff --git a/gpiocontrol/source/cc32xx/cc32xx/cc32xx_support.h b/gpiocontrol/source/cc32xx/targets/cc32xx/target.h
similarity index 59%
rename from gpiocontrol/source/cc32xx/cc32xx/cc32xx_support.h
rename to gpiocontrol/source/cc32xx/targets/cc32xx/target.h
index c8c53d4c8..671ab49b3 100644
--- a/gpiocontrol/source/cc32xx/cc32xx/cc32xx_support.h
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/target.h
@@ -14,44 +14,24 @@
  *  limitations under the License.
  */
 
+// TODO APP-63: this file will be moved to 'common' dir and likely that it will be reviewed
 #ifndef CC32XX_SUPPORT_H_
 #define CC32XX_SUPPORT_H_
 
-/* Avoid redifined warning */
-#undef FD_SETSIZE
-#undef FD_SET
-#undef FD_CLR
-#undef FD_ISSET
-#undef FD_ZERO
-#undef fd_set
-
 #include "hw_types.h"
-#include "hw_ints.h"
-#include "hw_memmap.h"
-#include "hw_common_reg.h"
-#include "rom.h"
-#include "rom_map.h"
-#include "interrupt.h"
-#include "hw_apps_rcm.h"
-#include "prcm.h"
+#include "uart_if.h"
 #include "common.h"
-#include "uart.h"
 #include "gpio.h"
 #include "gpio_if.h"
-#include "uart_if.h"
-#include "udma_if.h"
 #include "pin.h"
 
-#include "common.h"
-
-#include "simplelink.h"
+#define demo_printf(msg, ...)   UART_PRINT((msg), ##__VA_ARGS__)
 
-void BoardInit();
-
-void wlan_configure();
-void wlan_scan();
-int  wlan_connect(const char *ssid, const char *pass, unsigned char sec_type);
-
-void net_ping(const char *host);
+/* Initialises a target. Zero value means success, negative - errors.
+ *
+ * For this particular target this will eventually try to connect to
+ * the WiFi spot using SSID and password supplied during build.
+ */
+int target_initialise(void);
 
 #endif //CC32XX_SUPPORT_H_

From 0172e01590b5da5b653a3e4f465eaf67eb4783be Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Tue, 5 Apr 2016 17:38:27 +0300
Subject: [PATCH 15/42] APP-59 Fix of different initialization bugs and compile
 warnings

Includes:
 - Fix for heap region overlap due to incorrect heap start address.
 - Fix for debug build failures due to missing stubs (lack of nosys
   lib).
 - Fix warnings in target support module.
 - Minor style adjustements and optimizations.
 - Removed unneeded mDNS call.
---
 gpiocontrol/source/cc32xx/src/kaa_demo.c      | 23 ++++----
 .../cc32xx/targets/cc32xx/CMakeLists.txt      | 22 ++++---
 .../source/cc32xx/targets/cc32xx/app.ld       | 59 +++++++++----------
 .../cc32xx/targets/cc32xx/cc32xx_support.c    | 25 +++++---
 4 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/gpiocontrol/source/cc32xx/src/kaa_demo.c b/gpiocontrol/source/cc32xx/src/kaa_demo.c
index 3790192d3..3d5cd625c 100644
--- a/gpiocontrol/source/cc32xx/src/kaa_demo.c
+++ b/gpiocontrol/source/cc32xx/src/kaa_demo.c
@@ -33,7 +33,6 @@
 // TODO APP-63: abstract gpio functions into separate target driver
 
 static kaa_client_t *kaa_client = NULL;
-static bool is_shutdown = false;
 
 static int gpio_led[] = { 0, 0, 0 };
 static int led_number = sizeof (gpio_led) / sizeof (int);
@@ -95,29 +94,31 @@ int main(void)
         return 1;
     }
 
-    demo_printf("GPIO demo started\n");
+    demo_printf("GPIO demo started\r\n");
 
     /**
      * Initialize Kaa client.
      */
     kaa_error_t error_code = kaa_client_create(&kaa_client, NULL);
     if (error_code) {
-        demo_printf("Failed to create client context: %i\n", error_code);
+        demo_printf("Failed to create client context: %i\r\n", error_code);
         return 2;
     }
 
-    error_code = kaa_profile_manager_set_endpoint_access_token(kaa_client_get_context(kaa_client)->profile_manager, DEMO_ACCESS_TOKEN);
+    error_code = kaa_profile_manager_set_endpoint_access_token(kaa_client_get_context(kaa_client)->profile_manager,
+            DEMO_ACCESS_TOKEN);
+
     if (error_code) {
-        demo_printf("Failed to set access token: %i\n", error_code);
+        demo_printf("Failed to set access token: %i\r\n", error_code);
         return 3;
     }
 
 
-    error_code = kaa_event_manager_set_kaa_remote_control_ecf_device_info_request_listener(kaa_client_get_context(kaa_client)->event_manager
-                                                                                         , &kaa_device_info_request
-                                                                                         , NULL);
+    error_code = kaa_event_manager_set_kaa_remote_control_ecf_device_info_request_listener(kaa_client_get_context(kaa_client)->event_manager,
+                                                                                          &kaa_device_info_request,
+                                                                                          NULL);
     if (error_code) {
-        demo_printf("Unable to set remote control listener: %i\n", error_code);
+        demo_printf("Unable to set remote control listener: %i\r\n", error_code);
         return 4;
     }
 
@@ -126,7 +127,7 @@ int main(void)
      */
     error_code = kaa_client_start(kaa_client, NULL, NULL, 0);
     if (error_code) {
-        demo_printf("Unable to start Kaa client: %i\n", error_code);
+        demo_printf("Unable to start Kaa client: %i\r\n", error_code);
         return 5;
     }
 
@@ -135,7 +136,7 @@ int main(void)
      */
     kaa_client_destroy(kaa_client);
 
-    demo_printf("GPIO demo stopped\n");
+    demo_printf("GPIO demo stopped\r\n");
 
     return error_code;
 }
diff --git a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
index e2430dec4..0440393d2 100644
--- a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
@@ -34,6 +34,8 @@ target_include_directories(target_support
         ${CC32XX_SDK}/example/common)
 
 # Find and use ARM GCC libraries, provided that CMAKE_FIND_ROOT_PATH is properly set
+# TODO KAA-994: Use gcc as a linker, rather than listing versions dirs in PATH_SUFFIXES variables
+# and trying to link/find libraries. See related issue for further details.
 
 find_library(LIB_C_PATH
         NAMES c libc
@@ -45,28 +47,32 @@ find_library(LIB_M_PATH
         PATHS /lib/armv7e-m/
         NO_DEFAULT_PATH)
 
-# TODO: find more elegant solution to support different versions of the gcc library
-# Rather than listing versions dirs in PATH_SUFFIXES variables
+# Required for few stubs when in debug mode
+find_library(LIB_NOSYS_PATH
+        NAMES nosys
+        PATHS /lib/armv7e-m/
+        NO_DEFAULT_PATH)
+
 find_library(LIB_GCC_PATH
         NAMES gcc
         PATHS "${TOOLCHAIN_PATH}/lib/gcc/arm-none-eabi/"
-        PATH_SUFFIXES 5.3.0/armv7e-m/ 4.9.3/armv7e-m/
+        PATH_SUFFIXES 5.3.0/armv7e-m/ 4.9.3/armv7e-m/ 4.7.4/armv7e-m/
         NO_DEFAULT_PATH
         NO_CMAKE_FIND_ROOT_PATH)
 
 # GCC dependencies
-target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH})
+target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH} ${LIB_NOSYS_PATH})
 # CC32XX dependencies
 target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS})
-# Propagate linker script
+## Propagate linker script
 target_link_libraries(target_support PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/app.ld)
 
-message("WiFi AP: ${WIFI_SSID}")
-message("WiFi Pass: ${WIFI_PASSWORD}")
+message(STATUS "WiFi AP: ${WIFI_SSID}")
+message(STATUS "WiFi Pass: ${WIFI_PASSWORD}")
 
 # Expose WiFi credentials
 target_compile_definitions(target_support
         PUBLIC
         -DWIFI_SSID="${WIFI_SSID}"
         -DWIFI_PASSWORD="${WIFI_PASSWORD}"
-        -DDEMO_ACCESS_TOKEN="${DEMO_ACCESS_TOKEN}")
\ No newline at end of file
+        -DDEMO_ACCESS_TOKEN="${DEMO_ACCESS_TOKEN}")
diff --git a/gpiocontrol/source/cc32xx/targets/cc32xx/app.ld b/gpiocontrol/source/cc32xx/targets/cc32xx/app.ld
index 368e3fd71..d2809791f 100644
--- a/gpiocontrol/source/cc32xx/targets/cc32xx/app.ld
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/app.ld
@@ -3,47 +3,45 @@
 *
 * GCC Linker script for blinky application.
 *
-* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
-* 
-* 
-*  Redistribution and use in source and binary forms, with or without 
-*  modification, are permitted provided that the following conditions 
+* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+*
+*
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
 *  are met:
 *
-*    Redistributions of source code must retain the above copyright 
+*    Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 *    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the 
-*    documentation and/or other materials provided with the   
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the
 *    distribution.
 *
 *    Neither the name of Texas Instruments Incorporated nor the names of
 *    its contributors may be used to endorse or promote products derived
 *    from this software without specific prior written permission.
 *
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 ******************************************************************************/
 
 
-HEAP_SIZE = 0x00010000;
-
 MEMORY
 {
     /* SRAM size of 240KB for cc3200 ES 1.33 device onward */
     /* SRAM (rwx) : ORIGIN = 0x20004000, LENGTH = 0x3C000 */
-	SRAM (rwx) : ORIGIN = 0x20004000, LENGTH = 0x0002C000
+    SRAM (rwx) : ORIGIN = 0x20004000, LENGTH = 0x0002C000
 }
 
 SECTIONS
@@ -54,24 +52,25 @@ SECTIONS
         KEEP(*(.intvecs))
         *(.text*)
         *(.rodata*)
-	*(.ARM.extab* .gnu.linkonce.armextab.*)
-	. = ALIGN(8);
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+        . = ALIGN(8);
         _etext = .;
     } > SRAM
 
-    .ARM : {
-    __exidx_start = .;
+    .ARM :
+    {
+      __exidx_start = .;
       *(.ARM.exidx*)
       __exidx_end = .;
     } > SRAM
 
     __init_data = .;
 
-    .data : AT(__init_data)
+    .data :
     {
         _data = .;
         *(.data*)
-	. = ALIGN (8);
+        . = ALIGN(8);
         _edata = .;
     } > SRAM
 
@@ -80,16 +79,12 @@ SECTIONS
         _bss = .;
         *(.bss*)
         *(COMMON)
+        . = ALIGN(8);
         _ebss = .;
     } > SRAM
 
-    .heap :
-    {
-	_heap = .;
-	. = . + HEAP_SIZE;
-	. = ALIGN(8);
-	_eheap = .;
-
-    }
+    _heap = .;
+    /* All remaining RAM is for heap */
+    _eheap = (ORIGIN(SRAM) + LENGTH(SRAM) - 1);
 }
 
diff --git a/gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c b/gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c
index 4999ed628..d6e770b0a 100644
--- a/gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/cc32xx_support.c
@@ -190,17 +190,21 @@ void BoardInit()
     PRCMCC3200MCUInit();
 
     UDMAInit();
-	
-	MAP_PRCMPeripheralClkEnable(PRCM_UARTA0, PRCM_RUN_MODE_CLK);
+
+    MAP_PRCMPeripheralClkEnable(PRCM_UARTA0, PRCM_RUN_MODE_CLK);
     MAP_PinTypeUART(PIN_55, PIN_MODE_3);
     MAP_PinTypeUART(PIN_57, PIN_MODE_3);
-	
+
     InitTerm();
+
+    Report("Board inited\r\n");
 }
 
 
 void wlan_configure()
 {
+
+    Report("Configuring WLAN...\r\n");
     sl_Start(NULL, NULL, NULL);
 
     //
@@ -238,12 +242,11 @@ void wlan_configure()
     sl_WlanSet(SL_WLAN_CFG_GENERAL_PARAM_ID, WLAN_GENERAL_PARAM_OPT_STA_TX_POWER, 1, (unsigned char *)&ucPower);
     // Set PM policy to normal
     sl_WlanPolicySet(SL_POLICY_PM , SL_NORMAL_POLICY, NULL, 0);
-    // Unregister mDNS services
-    sl_NetAppMDNSUnRegisterService(0, 0);
     // Remove  all 64 filters (8*8)
     memset(RxFilterIdMask.FilterIdMask, 0xFF, 8);
     sl_WlanRxFilterSet(SL_REMOVE_RX_FILTER, (_u8 *)&RxFilterIdMask, sizeof(_WlanRxFilterOperationCommandBuff_t));
     sl_Stop(SL_STOP_TIMEOUT);
+    Report("WLAN configuration complete\r\n");
 }
 
 void wlan_scan()
@@ -270,6 +273,7 @@ void wlan_scan()
 
 int wlan_connect(const char *ssid, const char *pass, unsigned char sec_type)
 {
+    Report("Connecting to network SSID: %s with password: %s\r\n", ssid, pass);
     SlSecParams_t secParams = {0};
     long lRetVal = 0;
 
@@ -280,8 +284,9 @@ int wlan_connect(const char *ssid, const char *pass, unsigned char sec_type)
     lRetVal = sl_WlanConnect((signed char*)ssid, strlen(ssid), 0, &secParams, 0);
     ASSERT_ON_ERROR(lRetVal);
 
-    while((!IS_CONNECTED(g_ulStatus)) || (!IS_IP_ACQUIRED(g_ulStatus)))
-        _SlNonOsMainLoopTask();   
+    while((!IS_CONNECTED(g_ulStatus)) || (!IS_IP_ACQUIRED(g_ulStatus))) {
+        _SlNonOsMainLoopTask();
+    }
 
     SlDateTime_t dateTime= {0};
     dateTime.sl_tm_day =   1;          // Day of month (DD format) range 1-13
@@ -295,6 +300,7 @@ int wlan_connect(const char *ssid, const char *pass, unsigned char sec_type)
               sizeof(SlDateTime_t),(unsigned char *)(&dateTime));
     ASSERT_ON_ERROR(lRetVal);
 
+    Report("Connected sucessfully\r\n");
     return 0;
 }
 
@@ -338,6 +344,7 @@ int target_initialise()
     GPIO_IF_LedOff(MCU_ALL_LED_IND);
 
     wlan_configure();
-    //sl_Start(0, 0, 0);
+    sl_Start(0, 0, 0);
     wlan_connect(WIFI_SSID, WIFI_PASSWORD, SL_SEC_TYPE_WPA_WPA2);
-}
\ No newline at end of file
+    return 0;
+}

From 55b89c7b01ff9972835f552d7f670570472b57f9 Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Mon, 11 Apr 2016 17:39:12 +0300
Subject: [PATCH 16/42] APP-59 Fix missing event handler

Without proper registration GPIO event cannot be received.
---
 gpiocontrol/source/cc32xx/src/kaa_demo.c | 25 ++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/gpiocontrol/source/cc32xx/src/kaa_demo.c b/gpiocontrol/source/cc32xx/src/kaa_demo.c
index 3d5cd625c..29a74cfaa 100644
--- a/gpiocontrol/source/cc32xx/src/kaa_demo.c
+++ b/gpiocontrol/source/cc32xx/src/kaa_demo.c
@@ -41,13 +41,15 @@ static int led_number = sizeof (gpio_led) / sizeof (int);
  * Event callback-s.
  */
 
-void kaa_device_info_request(void *context
+static void kaa_device_info_request(void *context
                            , kaa_remote_control_ecf_device_info_request_t *event
                            , kaa_endpoint_id_p source)
 {
     (void)context;
     (void)source;
 
+    demo_printf("Device info request received\r\n");
+
     kaa_remote_control_ecf_device_info_response_t *response = kaa_remote_control_ecf_device_info_response_create();
 
     response->device_name = kaa_string_copy_create("CC3200");
@@ -68,13 +70,15 @@ void kaa_device_info_request(void *context
     event->destroy(event);
 }
 
-void kaa_GPIOToggle_info_request(void *context
+static void kaa_GPIOToggle_info_request(void *context
                               , kaa_remote_control_ecf_gpio_toggle_request_t *event
                               , kaa_endpoint_id_p source)
 {
     (void)context;
     (void)source;
 
+    demo_printf("Toggling GPIO...\r\n");
+
     if (event->gpio->status) {
         GPIO_IF_LedOn(MCU_RED_LED_GPIO + event->gpio->id);
         gpio_led[event->gpio->id] = 1;
@@ -88,7 +92,6 @@ void kaa_GPIOToggle_info_request(void *context
 
 int main(void)
 {
-
     int rc = target_initialise();
     if (rc < 0) {
         return 1;
@@ -115,20 +118,30 @@ int main(void)
 
 
     error_code = kaa_event_manager_set_kaa_remote_control_ecf_device_info_request_listener(kaa_client_get_context(kaa_client)->event_manager,
-                                                                                          &kaa_device_info_request,
-                                                                                          NULL);
+            kaa_device_info_request,
+            NULL);
+
     if (error_code) {
         demo_printf("Unable to set remote control listener: %i\r\n", error_code);
         return 4;
     }
 
+    error_code = kaa_event_manager_set_kaa_remote_control_ecf_gpio_toggle_request_listener(kaa_client_get_context(kaa_client)->event_manager,
+            kaa_GPIOToggle_info_request,
+            NULL);
+
+    if (error_code) {
+        demo_printf("Unable to set GPIO listener: %i\r\n", error_code);
+        return 5;
+    }
+
     /**
      * Start Kaa client main loop.
      */
     error_code = kaa_client_start(kaa_client, NULL, NULL, 0);
     if (error_code) {
         demo_printf("Unable to start Kaa client: %i\r\n", error_code);
-        return 5;
+        return 6;
     }
 
     /**

From dbd0bdeb2fe63f065bdf629790a41c6f3b24b65b Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Thu, 14 Apr 2016 13:39:06 +0300
Subject: [PATCH 17/42] Update with notion of issue inside TODO

---
 gpiocontrol/source/cc32xx/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gpiocontrol/source/cc32xx/build.sh b/gpiocontrol/source/cc32xx/build.sh
index 03c1a8c9b..e3b9bd29c 100755
--- a/gpiocontrol/source/cc32xx/build.sh
+++ b/gpiocontrol/source/cc32xx/build.sh
@@ -94,7 +94,7 @@ build_app() {
 
     KAA_TOOLCHAIN_PATH_SDK="-DCMAKE_TOOLCHAIN_FILE=$KAA_LIB_PATH/toolchains/cc32xx.cmake"
 
-    # TODO: comments about KAA_PLATFORM and KAA_TARGET
+    # TODO: APP-63 comments about KAA_PLATFORM and KAA_TARGET
     cmake -DKAA_PLATFORM=$KAA_TARGET \
           -DKAA_TARGET=$KAA_TARGET \
           -DKAA_PRODUCE_BINARY=$KAA_PRODUCE_BINARY \

From 7be5de7304d6015c93025f8baea5c3f28a1763ae Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Thu, 14 Apr 2016 16:38:31 +0300
Subject: [PATCH 18/42] KAA-947 Update GPIO app to work with CC32XX SDK v.1.2.0

---
 gpiocontrol/source/cc32xx/CMakeLists.txt       | 18 +++---------------
 .../cc32xx/targets/cc32xx/CMakeLists.txt       |  9 ++++++++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/gpiocontrol/source/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/CMakeLists.txt
index 80fbe7e17..c0bc9bc58 100644
--- a/gpiocontrol/source/cc32xx/CMakeLists.txt
+++ b/gpiocontrol/source/cc32xx/CMakeLists.txt
@@ -21,31 +21,19 @@ enable_language(C)
 # Target-independent flags.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
 
-# TODO: (KAA-858) Remove it after issue will be resolved
-if(KAA_DEBUG_ENABLED)
-    set(CMAKE_BUILD_TYPE "Debug")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0")
-else()
-    set(CMAKE_BUILD_TYPE "MinSizeRel")
-endif()
-
 # Our application name.
 set(APP_NAME demo_client)
 
-# List of additional libraries depends on target chosen.
-set(ADDITIONAL_LIBS)
-
+# Demo executable.
+add_executable(${APP_NAME} src/kaa_demo.c)
 
 # Path to the Kaa SDK.
 add_subdirectory(libs/kaa)
 # Directory containing target support library.
 add_subdirectory(targets/${KAA_TARGET})
 
-# Demo executable.
-add_executable(${APP_NAME} src/kaa_demo.c)
-
 # All libraries that demo app depends on.
-target_link_libraries(${APP_NAME} kaac_s target_support ${APP_LIBS})
+target_link_libraries(${APP_NAME} kaac_s target_support)
 
 # For most embedded targets binary stripping is required.
 if(${KAA_PRODUCE_BINARY})
diff --git a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
index 0440393d2..69d04a6b4 100644
--- a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
@@ -12,10 +12,16 @@ add_library(target_support
         ${CC32XX_SDK}/example/common/uart_if.c
         ${CC32XX_SDK}/example/common/udma_if.c
         ${CC32XX_SDK}/example/common/gpio_if.c
+        ${CC32XX_SDK}/example/common/utils_if.c
         ${CC32XX_SDK}/example/common/startup_gcc.c
         cc32xx_support.c
         )
 
+# Addtional library required for nonos library
+add_library(cc32xx_common
+        STATIC
+        ${CC32XX_SDK}/example/common/network_common.c)
+
 target_include_directories(target_support PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # CC32XX SDK libraries
@@ -63,7 +69,7 @@ find_library(LIB_GCC_PATH
 # GCC dependencies
 target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH} ${LIB_NOSYS_PATH})
 # CC32XX dependencies
-target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS})
+target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS} cc32xx_common)
 ## Propagate linker script
 target_link_libraries(target_support PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/app.ld)
 
@@ -76,3 +82,4 @@ target_compile_definitions(target_support
         -DWIFI_SSID="${WIFI_SSID}"
         -DWIFI_PASSWORD="${WIFI_PASSWORD}"
         -DDEMO_ACCESS_TOKEN="${DEMO_ACCESS_TOKEN}")
+

From 395521e01cf3f9d90b230e9bbbe64b35bd1c6dff Mon Sep 17 00:00:00 2001
From: Peter Krutsiuk <pkrutsiuk@cybervisiontech.com>
Date: Fri, 15 Apr 2016 11:30:46 +0300
Subject: [PATCH 19/42] APP-70: Add time stamp in java and cpp samples

---
 datacollectiondemo/resources/logSchema.json   |  4 ++++
 datacollectiondemo/source/cpp/src/KaaDemo.cpp | 15 ++++++++----
 .../datacollection/DataCollectionDemo.java    | 23 +++++++++++--------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/datacollectiondemo/resources/logSchema.json b/datacollectiondemo/resources/logSchema.json
index 20bd19dc5..d7588f4cd 100644
--- a/datacollectiondemo/resources/logSchema.json
+++ b/datacollectiondemo/resources/logSchema.json
@@ -25,6 +25,10 @@
     {
       "name":"message",
       "type":"string"
+    },
+    {
+      "name" : "timeStamp",
+      "type" : "long"
     }
   ]
 }
\ No newline at end of file
diff --git a/datacollectiondemo/source/cpp/src/KaaDemo.cpp b/datacollectiondemo/source/cpp/src/KaaDemo.cpp
index 8f23cd5f3..71ad4c830 100644
--- a/datacollectiondemo/source/cpp/src/KaaDemo.cpp
+++ b/datacollectiondemo/source/cpp/src/KaaDemo.cpp
@@ -49,7 +49,7 @@ int main()
      */
     kaaClient->start();
 
-    std::list<RecordFuture> futures;
+    std::list<std::pair<RecordFuture, std::size_t>> futuresMap;
 
     // Send LOGS_TO_SEND_COUNT logs in a loop.
     std::size_t logNumber = 0;
@@ -58,18 +58,23 @@ int main()
         logRecord.level = kaa_log::Level::KAA_INFO;
         logRecord.tag = "TAG";
         logRecord.message = "MESSAGE_" + std::to_string(logNumber);
+        logRecord.timeStamp = TimeUtils::getCurrentTimeInMs();
 
-        futures.push_back(std::move(kaaClient->addLogRecord(logRecord)));
+        futuresMap.push_back(std::pair<RecordFuture, std::size_t>(
+                             std::move(kaaClient->addLogRecord(logRecord)), logRecord.timeStamp));
         std::cout << "Sent " << logNumber << "th record" << std::endl;
     }
 
-    for (auto& future : futures) {
+    for (auto& pair : futuresMap) {
         try {
-            RecordInfo recordInfo = future.get();
+            RecordInfo recordInfo = pair.first.get();
             BucketInfo bucketInfo = recordInfo.getBucketInfo();
 
+            std::size_t timeSpent = (recordInfo.getRecordAddedTimestampMs() - pair.second)
+                                        + recordInfo.getRecordDeliveryTimeMs();
+
             std::cout << "Received log record delivery info. Bucket Id [" <<  bucketInfo.getBucketId() << "]. "
-                      << "Record delivery time [" << recordInfo.getRecordDeliveryTimeMs() << " ms]." << std::endl;
+                      << "Record delivery time [" << timeSpent << " ms]." << std::endl;
         } catch (std::exception& e) {
             std::cout << "Exception was caught while waiting for callback future" << e.what();
         }
diff --git a/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java b/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java
index b4fda8f73..8a4cfceeb 100644
--- a/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java
+++ b/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java
@@ -67,32 +67,37 @@ public void onStopped() {
         // Start the Kaa client and connect it to the Kaa server.
         kaaClient.start();
 
-        // Collect log record delivery futures.
-        Set<RecordFuture> futures = new HashSet<>();
-        
+        // Collect log record delivery futures and corresponding log record creation timestamps.
+        Map<RecordFuture, Long> futuresMap = new HashMap<>();
+
         // Send logs in a loop.
         for (LogData log : generateLogs(LOGS_TO_SEND_COUNT)) {
-            futures.add(kaaClient.addLogRecord(log));
+            futuresMap.put(kaaClient.addLogRecord(log), log.getTimeStamp());
             LOG.info("Log record {} sent", log.toString());
         }
-        
+
         // Iterate over log record delivery futures and wait for delivery
         // acknowledgment for each record.
-        for (RecordFuture future : futures) {
+        Iterator<RecordFuture> iterator = futuresMap.keySet().iterator();
+        RecordFuture future = null;
+        while (iterator.hasNext()) {
+            future = iterator.next();
             try {
                 RecordInfo recordInfo = future.get();
                 BucketInfo bucketInfo = recordInfo.getBucketInfo();
+                Long timeSpent = (recordInfo.getRecordAddedTimestampMs() - futuresMap.get(future))
+                        + recordInfo.getRecordDeliveryTimeMs();
                 LOG.info(
                         "Received log record delivery info. Bucket Id [{}]. Record delivery time [{} ms].",
-                        bucketInfo.getBucketId(),
-                        recordInfo.getRecordDeliveryTimeMs());
+                        bucketInfo.getBucketId(), timeSpent);
+                iterator.remove();
             } catch (Exception e) {
                 LOG.error(
                         "Exception was caught while waiting for callback future",
                         e);
             }
         }
-        
+
         // Stop the Kaa client and release all the resources which were in use.
         kaaClient.stop();
         LOG.info("Data collection demo stopped");

From 10d69756f3a2be453cee5f0d6235eb6a68f295b3 Mon Sep 17 00:00:00 2001
From: Peter Krutsiuk <pkrutsiuk@cybervisiontech.com>
Date: Fri, 15 Apr 2016 12:57:52 +0300
Subject: [PATCH 20/42] APP-70: Update cpp and objective-c samples

---
 datacollectiondemo/source/cpp/src/KaaDemo.cpp | 11 ++-
 .../objc/DataCollectionDemo/ViewController.m  | 67 ++++++-------------
 2 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/datacollectiondemo/source/cpp/src/KaaDemo.cpp b/datacollectiondemo/source/cpp/src/KaaDemo.cpp
index 71ad4c830..644783c23 100644
--- a/datacollectiondemo/source/cpp/src/KaaDemo.cpp
+++ b/datacollectiondemo/source/cpp/src/KaaDemo.cpp
@@ -49,7 +49,7 @@ int main()
      */
     kaaClient->start();
 
-    std::list<std::pair<RecordFuture, std::size_t>> futuresMap;
+    std::list<std::pair<RecordFuture, std::size_t>> futurePairs;
 
     // Send LOGS_TO_SEND_COUNT logs in a loop.
     std::size_t logNumber = 0;
@@ -60,17 +60,16 @@ int main()
         logRecord.message = "MESSAGE_" + std::to_string(logNumber);
         logRecord.timeStamp = TimeUtils::getCurrentTimeInMs();
 
-        futuresMap.push_back(std::pair<RecordFuture, std::size_t>(
-                             std::move(kaaClient->addLogRecord(logRecord)), logRecord.timeStamp));
+        futurePairs.push_back(std::make_pair(std::move(kaaClient->addLogRecord(logRecord)), logRecord.timeStamp));
         std::cout << "Sent " << logNumber << "th record" << std::endl;
     }
 
-    for (auto& pair : futuresMap) {
+    for (auto it = futurePairs.begin(); it != futurePairs.end(); ++it) {
         try {
-            RecordInfo recordInfo = pair.first.get();
+            RecordInfo recordInfo = it->first.get();
             BucketInfo bucketInfo = recordInfo.getBucketInfo();
 
-            std::size_t timeSpent = (recordInfo.getRecordAddedTimestampMs() - pair.second)
+            std::size_t timeSpent = (recordInfo.getRecordAddedTimestampMs() - it->second)
                                         + recordInfo.getRecordDeliveryTimeMs();
 
             std::cout << "Received log record delivery info. Bucket Id [" <<  bucketInfo.getBucketId() << "]. "
diff --git a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
index c84595ca7..e88139787 100644
--- a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
+++ b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
@@ -19,8 +19,6 @@
 
 #define LOGS_TO_SEND_COUNT 5
 
-#pragma mark - ViewController
-
 @interface ViewController () <KaaClientStateDelegate, ProfileContainer>
 
 @property (nonatomic, weak) IBOutlet UITextView *logTextView;
@@ -33,47 +31,49 @@ @implementation ViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+
     [self addLogWithText:@"DataCollectionDemo started"];
-    
+
     //Create a Kaa client with the Kaa default context.
     self.kaaClient = [Kaa clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
-    
+
     // Set a custom strategy for uploading logs.
     // The default strategy uploads logs after either a threshold logs count
     // or a threshold logs size has been reached.
     // The following custom strategy uploads every log record as soon as it is created.
     [self.kaaClient setLogUploadStrategy:[[RecordCountLogUploadStrategy alloc] initWithCountThreshold:1]];
     [self.kaaClient setProfileContainer:self];
-    
+
     // Start the Kaa client and connect it to the Kaa server.
     [self.kaaClient start];
-    
+
     // Send logs in a loop.
     NSArray *logs = [self generateLogs:LOGS_TO_SEND_COUNT];
-    
+
     [self addLogWithText:[NSString stringWithFormat:@"Record size: %ld", (long)[self getLogRecordSize:logs[0]]]];
-    
+
     // Collect log record delivery runners.
-    NSMutableSet *bucketRunners = [NSMutableSet set];
-    
+    NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+
     for (KAALogData *log in logs) {
-        [bucketRunners addObject:[self.kaaClient addLogRecord:log]];
-        [self addLogWithText:[NSString stringWithFormat:@"Log sent: loglevel - %u, tag - %@, message - %@", log.level, log.tag, log.message]];
+        dictionary[@(log.timeStamp)] = [self.kaaClient addLogRecord:log];
+        [self addLogWithText:[NSString stringWithFormat:@"Log sent: loglevel: %u, tag: %@, message: %@, timestamp: %lld",
+                              log.level, log.tag, log.message, log.timeStamp]];
     }
-    
-    for (BucketRunner *runner in bucketRunners) {
+
+    for (NSNumber *timeKey in dictionary.allKeys) {
         @try {
             [[[NSOperationQueue alloc] init] addOperationWithBlock:^{
+                BucketRunner *runner = dictionary[timeKey];
                 BucketInfo *bucketInfo = [runner getValue];
-                [self addLogWithText:[NSString stringWithFormat:@"Received log record delivery info. Bucket Id [%d]. Record delivery time [%f ms]", bucketInfo.bucketId, bucketInfo.bucketDeliveryDuration]];
+                int64_t timeSpent = bucketInfo.scheduledBucketTimestamp - [timeKey longLongValue] + bucketInfo.bucketDeliveryDuration;
+                [self addLogWithText:[NSString stringWithFormat:@"Received log record delivery info. Bucket id [%d], delivery time [%lld ms]", bucketInfo.bucketId, timeSpent]];
             }];
         }
         @catch (NSException *exception) {
             [self addLogWithText:@"Exception was caught while waiting for callback future"];
         }
     }
-    
 }
 
 - (NSInteger)getLogRecordSize:(KAALogData *)record {
@@ -87,8 +87,9 @@ - (NSArray *)generateLogs:(int)logCount {
     for (int i = 0; i < logCount; i++) {
         KAALogData *log = [[KAALogData alloc] init];
         log.level = LEVEL_KAA_INFO;
-        log.tag = @"iOSTAG";
+        log.tag = @"iOS";
         log.message = [NSString stringWithFormat:@"MESSAGE_%d", i];
+        log.timeStamp = CACurrentMediaTime() * 1000;
         [logs addObject:log];
     }
     return logs;
@@ -101,39 +102,11 @@ - (void)onStarted {
     [self addLogWithText:@"Kaa client started"];
 }
 
-- (void)onStopped {
-    [self addLogWithText:@"Kaa client stopped"];
-}
-
-- (void)onStartFailureWithException:(NSException *)exception {
-    [self addLogWithText:[NSString stringWithFormat:@"START FAILURE: %@ : %@", exception.name, exception.reason]];
-}
-
-- (void)onPaused {
-    [self addLogWithText:@"Client paused"];
-}
-
--(void)onPauseFailureWithException:(NSException *)exception {
-    [self addLogWithText:[NSString stringWithFormat:@"PAUSE FAILURE: %@ : %@", exception.name, exception.reason]];
-}
-
-- (void)onResume {
-    [self addLogWithText:@"Client resumed"];
-}
-
--(void)onResumeFailureWithException:(NSException *)exception {
-    [self addLogWithText:[NSString stringWithFormat:@"RESUME FAILURE: %@ : %@", exception.name, exception.reason]];
-}
-
--(void)onStopFailureWithException:(NSException *)exception {
-    [self addLogWithText:[NSString stringWithFormat:@"STOP FAILURE: %@ : %@", exception.name, exception.reason]];
-}
-
 - (KAAEmptyData *)getProfile {
     return [[KAAEmptyData alloc] init];
 }
 
-- (void) addLogWithText:(NSString *) text {
+- (void)addLogWithText:(NSString *) text {
     NSLog(@"%@", text);
     [[NSOperationQueue mainQueue] addOperationWithBlock:^{
         self.logTextView.text = [NSString stringWithFormat:@"%@%@\n", self.logTextView.text, text];

From c6c552bd995a0505ff32d6563a86f18a4b27789b Mon Sep 17 00:00:00 2001
From: Peter Krutsiuk <pkrutsiuk@cybervisiontech.com>
Date: Fri, 15 Apr 2016 13:26:30 +0300
Subject: [PATCH 21/42] APP-70: Update c sample

---
 datacollectiondemo/source/c/src/kaa_demo.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/datacollectiondemo/source/c/src/kaa_demo.c b/datacollectiondemo/source/c/src/kaa_demo.c
index c66440803..340d6213a 100644
--- a/datacollectiondemo/source/c/src/kaa_demo.c
+++ b/datacollectiondemo/source/c/src/kaa_demo.c
@@ -127,6 +127,8 @@ static void kaa_demo_add_log_record(void *context)
     log_record->level = ENUM_LEVEL_KAA_INFO;
     log_record->tag = kaa_string_move_create(KAA_DEMO_LOG_TAG, NULL);
 
+    log_record->time_stamp = KAA_TIME() * 1000;
+
     char log_message_buffer[KAA_DEMO_LOG_BUF_SZ];
     snprintf(log_message_buffer, KAA_DEMO_LOG_BUF_SZ, KAA_DEMO_LOG_MESSAGE"%zu", log_record_counter);
 

From 15ed2af21e3889863bd428021d1f0da4ee1bdbf7 Mon Sep 17 00:00:00 2001
From: Peter Krutsiuk <pkrutsiuk@cybervisiontech.com>
Date: Fri, 15 Apr 2016 14:58:48 +0300
Subject: [PATCH 22/42] APP-70: Fix java sample, update objective-c sample

---
 .../datacollection/DataCollectionDemo.java    | 18 +++++--------
 .../objc/DataCollectionDemo/ViewController.m  | 27 +++++++------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java b/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java
index 8a4cfceeb..b6a0b070c 100644
--- a/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java
+++ b/datacollectiondemo/source/java/src/org/kaaproject/kaa/demo/datacollection/DataCollectionDemo.java
@@ -16,10 +16,10 @@
 
 package org.kaaproject.kaa.demo.datacollection;
 
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 
 import org.kaaproject.kaa.client.DesktopKaaPlatformContext;
 import org.kaaproject.kaa.client.Kaa;
@@ -35,7 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * A demo application that shows how to use the Kaa logging API. 
+ * A demo application that shows how to use the Kaa logging API.
  */
 public class DataCollectionDemo {
 
@@ -60,10 +60,10 @@ public void onStopped() {
 
         // Set record count strategy for uploading logs with count threshold set to 1.
         // Defined strategy configuration informs to upload every log record as soon as it is created.
-        // The default strategy uploads logs after either a threshold logs count 
+        // The default strategy uploads logs after either a threshold logs count
         // or a threshold logs size has been reached.
         kaaClient.setLogUploadStrategy(new RecordCountLogUploadStrategy(1));
-        
+
         // Start the Kaa client and connect it to the Kaa server.
         kaaClient.start();
 
@@ -78,10 +78,7 @@ public void onStopped() {
 
         // Iterate over log record delivery futures and wait for delivery
         // acknowledgment for each record.
-        Iterator<RecordFuture> iterator = futuresMap.keySet().iterator();
-        RecordFuture future = null;
-        while (iterator.hasNext()) {
-            future = iterator.next();
+        for (RecordFuture future : futuresMap.keySet()) {
             try {
                 RecordInfo recordInfo = future.get();
                 BucketInfo bucketInfo = recordInfo.getBucketInfo();
@@ -90,7 +87,6 @@ public void onStopped() {
                 LOG.info(
                         "Received log record delivery info. Bucket Id [{}]. Record delivery time [{} ms].",
                         bucketInfo.getBucketId(), timeSpent);
-                iterator.remove();
             } catch (Exception e) {
                 LOG.error(
                         "Exception was caught while waiting for callback future",
@@ -106,7 +102,7 @@ public void onStopped() {
     public static List<LogData> generateLogs(int logCount) {
         List<LogData> logs = new LinkedList<LogData>();
         for (int i = 0; i < logCount; i++) {
-            logs.add(new LogData(Level.KAA_INFO, "TAG", "MESSAGE_" + i));
+            logs.add(new LogData(Level.KAA_INFO, "TAG", "MESSAGE_" + i, System.currentTimeMillis()));
         }
         return logs;
     }
diff --git a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
index e88139787..8e57f413b 100644
--- a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
+++ b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
@@ -46,12 +46,14 @@ - (void)viewDidLoad {
 
     // Start the Kaa client and connect it to the Kaa server.
     [self.kaaClient start];
+}
+
+- (void)onStarted {
+    [self addLogWithText:@"Kaa client started"];
 
     // Send logs in a loop.
     NSArray *logs = [self generateLogs:LOGS_TO_SEND_COUNT];
 
-    [self addLogWithText:[NSString stringWithFormat:@"Record size: %ld", (long)[self getLogRecordSize:logs[0]]]];
-
     // Collect log record delivery runners.
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
 
@@ -61,9 +63,11 @@ - (void)viewDidLoad {
                               log.level, log.tag, log.message, log.timeStamp]];
     }
 
+    NSOperationQueue *queue = [[NSOperationQueue alloc] init];
+
     for (NSNumber *timeKey in dictionary.allKeys) {
         @try {
-            [[[NSOperationQueue alloc] init] addOperationWithBlock:^{
+            [queue addOperationWithBlock:^{
                 BucketRunner *runner = dictionary[timeKey];
                 BucketInfo *bucketInfo = [runner getValue];
                 int64_t timeSpent = bucketInfo.scheduledBucketTimestamp - [timeKey longLongValue] + bucketInfo.bucketDeliveryDuration;
@@ -76,10 +80,8 @@ - (void)viewDidLoad {
     }
 }
 
-- (NSInteger)getLogRecordSize:(KAALogData *)record {
-    AvroBytesConverter *converter = [[AvroBytesConverter alloc] init];
-    NSData *serializedLogRecod = [converter toBytes:record];
-    return serializedLogRecod.length;
+- (KAAEmptyData *)getProfile {
+    return [[KAAEmptyData alloc] init];
 }
 
 - (NSArray *)generateLogs:(int)logCount {
@@ -95,17 +97,6 @@ - (NSArray *)generateLogs:(int)logCount {
     return logs;
 }
 
-
-#pragma mark - Delegate methods
-
-- (void)onStarted {
-    [self addLogWithText:@"Kaa client started"];
-}
-
-- (KAAEmptyData *)getProfile {
-    return [[KAAEmptyData alloc] init];
-}
-
 - (void)addLogWithText:(NSString *) text {
     NSLog(@"%@", text);
     [[NSOperationQueue mainQueue] addOperationWithBlock:^{

From d5cb31530bff1c3be1fda6fe6cb180019f0c4682 Mon Sep 17 00:00:00 2001
From: RostakaGmfun <rostawesomegd@gmail.com>
Date: Fri, 15 Apr 2016 18:44:33 +0300
Subject: [PATCH 23/42] APP-72: Fix wildcards in build.bat

---
 configurationdemo/source/cpp/build.bat  | 2 +-
 datacollectiondemo/source/cpp/build.bat | 2 +-
 eventdemo/source/cpp/build.bat          | 2 +-
 notificationdemo/source/cpp/build.bat   | 2 +-
 sparkdemo/source/cpp/build.bat          | 2 +-
 stormdemo/source/c/build.bat            | 2 +-
 stormdemo/source/cpp/build.bat          | 2 +-
 vehicletelemetry/source/cpp/build.bat   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configurationdemo/source/cpp/build.bat b/configurationdemo/source/cpp/build.bat
index 6d478e70a..fd2685f4e 100755
--- a/configurationdemo/source/cpp/build.bat
+++ b/configurationdemo/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
 	IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-		for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+		for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
 		)
diff --git a/datacollectiondemo/source/cpp/build.bat b/datacollectiondemo/source/cpp/build.bat
index b6b289264..4ac492258 100755
--- a/datacollectiondemo/source/cpp/build.bat
+++ b/datacollectiondemo/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
 	IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-		for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+		for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
 		)
diff --git a/eventdemo/source/cpp/build.bat b/eventdemo/source/cpp/build.bat
index 21def9a14..35a5ac2bd 100755
--- a/eventdemo/source/cpp/build.bat
+++ b/eventdemo/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
 	IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-		for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+		for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
 		)
diff --git a/notificationdemo/source/cpp/build.bat b/notificationdemo/source/cpp/build.bat
index 5991f2d6f..68b061780 100755
--- a/notificationdemo/source/cpp/build.bat
+++ b/notificationdemo/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
 	IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-		for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+		for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
 		)
diff --git a/sparkdemo/source/cpp/build.bat b/sparkdemo/source/cpp/build.bat
index 1b7cb9118..96fc9aba7 100755
--- a/sparkdemo/source/cpp/build.bat
+++ b/sparkdemo/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
     IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-        for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+        for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
         )
diff --git a/stormdemo/source/c/build.bat b/stormdemo/source/c/build.bat
index 8f100fd30..efcffc0fd 100755
--- a/stormdemo/source/c/build.bat
+++ b/stormdemo/source/c/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
     IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-        for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+        for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
         )
diff --git a/stormdemo/source/cpp/build.bat b/stormdemo/source/cpp/build.bat
index 8f100fd30..efcffc0fd 100755
--- a/stormdemo/source/cpp/build.bat
+++ b/stormdemo/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
     IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-        for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+        for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
         )
diff --git a/vehicletelemetry/source/cpp/build.bat b/vehicletelemetry/source/cpp/build.bat
index 8a53eb387..2ed92debc 100755
--- a/vehicletelemetry/source/cpp/build.bat
+++ b/vehicletelemetry/source/cpp/build.bat
@@ -60,7 +60,7 @@ goto help
 :build_thirdparty
  IF NOT EXIST %KAA_C_LIB_HEADER_PATH%\NUL (
 	IF NOT EXIST %KAA_CPP_LIB_HEADER_PATH%\NUL (
-		for /R %PROJECT_HOME% %%f in (kaa-client*.tar.gz) do (
+		for /R %PROJECT_HOME% %%f in (kaa-c*.tar.gz) do (
                         set val=%%f
                         set KAA_SDK_TAR_NAME=!val:\=/!
 		)

From 5515ebcb4088387a9f9bbc1dc9fd35c79599d3d4 Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Fri, 15 Apr 2016 20:02:35 +0300
Subject: [PATCH 24/42] KAA-947 Configuration and GPIO demo update

Added specific dependencies for TI SDK v1.2.0.
Added license headers.
---
 .../source/c/targets/cc32xx/CMakeLists.txt    | 53 +++++++++++++++----
 .../cc32xx/targets/cc32xx/CMakeLists.txt      | 22 ++++++--
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/configurationdemo/source/c/targets/cc32xx/CMakeLists.txt b/configurationdemo/source/c/targets/cc32xx/CMakeLists.txt
index 7e831fa3b..cce02e599 100644
--- a/configurationdemo/source/c/targets/cc32xx/CMakeLists.txt
+++ b/configurationdemo/source/c/targets/cc32xx/CMakeLists.txt
@@ -1,7 +1,25 @@
+#
+#  Copyright 2014-2016 CyberVision, Inc.
+#
+#  Licensed 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.
+#
+
+# TODO APP-63: this file must be reviewed and moved to common targets dir
+
 # Before this module is added, SDK path must be provided
-if (NOT EXISTS "${CC32XX_SDK}")
+if(NOT EXISTS "${CC32XX_SDK}")
     message(FATAL_ERROR "CC32XX SDK path: ${CC32XX_SDK} not exist!")
-endif ()
+endif()
 
 # Target support library that provides abstractions for cc32xx target.
 add_library(target_support
@@ -10,12 +28,17 @@ add_library(target_support
         ${CC32XX_SDK}/example/common/uart_if.c
         ${CC32XX_SDK}/example/common/udma_if.c
         ${CC32XX_SDK}/example/common/gpio_if.c
+        ${CC32XX_SDK}/example/common/utils_if.c
         ${CC32XX_SDK}/example/common/startup_gcc.c
         cc32xx_support.c
         )
 
-target_include_directories(target_support PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+# Additional library required for nonos library
+add_library(cc32xx_common
+        STATIC
+        ${CC32XX_SDK}/example/common/network_common.c)
 
+target_include_directories(target_support PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # CC32XX SDK libraries
 
@@ -33,6 +56,8 @@ target_include_directories(target_support
         ${CC32XX_SDK}/example/common)
 
 # Find and use ARM GCC libraries, provided that CMAKE_FIND_ROOT_PATH is properly set
+# TODO KAA-994: Use gcc as a linker, rather than listing versions dirs in PATH_SUFFIXES variables
+# and trying to link/find libraries. See related issue for further details.
 
 find_library(LIB_C_PATH
         NAMES c libc
@@ -44,27 +69,33 @@ find_library(LIB_M_PATH
         PATHS /lib/armv7e-m/
         NO_DEFAULT_PATH)
 
-# TODO: find more elegant solution to support different versions of the gcc library
-# Rather than listing versions dirs in PATH_SUFFIXES variables
+# Required for few stubs when in debug mode
+find_library(LIB_NOSYS_PATH
+        NAMES nosys
+        PATHS /lib/armv7e-m/
+        NO_DEFAULT_PATH)
+
 find_library(LIB_GCC_PATH
         NAMES gcc
         PATHS "${TOOLCHAIN_PATH}/lib/gcc/arm-none-eabi/"
-        PATH_SUFFIXES 5.3.0/armv7e-m/ 4.9.3/armv7e-m/
+        PATH_SUFFIXES 5.3.0/armv7e-m/ 4.9.3/armv7e-m/ 4.7.4/armv7e-m/
         NO_DEFAULT_PATH
         NO_CMAKE_FIND_ROOT_PATH)
 
 # GCC dependencies
-target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH})
+target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH} ${LIB_NOSYS_PATH})
 # CC32XX dependencies
-target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS})
+target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS} cc32xx_common)
 # Propagate linker script
-target_link_libraries(target_support PUBLIC -T ${CMAKE_CURRENT_SOURCE_DIR}/app.ld)
+target_link_libraries(target_support PUBLIC -T${CMAKE_CURRENT_SOURCE_DIR}/app.ld)
 
-message("WiFi AP: ${WIFI_SSID}")
-message("WiFi Pass: ${WIFI_PASSWORD}")
+message(STATUS "WiFi AP: ${WIFI_SSID}")
+message(STATUS "WiFi Pass: ${WIFI_PASSWORD}")
 
 # Expose WiFi credentials
 target_compile_definitions(target_support
         PUBLIC
         -DWIFI_SSID="${WIFI_SSID}"
         -DWIFI_PASSWORD="${WIFI_PASSWORD}")
+
+
diff --git a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
index 69d04a6b4..64c200f75 100644
--- a/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
+++ b/gpiocontrol/source/cc32xx/targets/cc32xx/CMakeLists.txt
@@ -1,3 +1,19 @@
+#
+#  Copyright 2014-2016 CyberVision, Inc.
+#
+#  Licensed 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.
+#
+
 # TODO APP-63: this file must be reviewed and moved to common targets dir
 
 # Before this module is added, SDK path must be provided
@@ -17,7 +33,7 @@ add_library(target_support
         cc32xx_support.c
         )
 
-# Addtional library required for nonos library
+# Additional library required for nonos library
 add_library(cc32xx_common
         STATIC
         ${CC32XX_SDK}/example/common/network_common.c)
@@ -70,8 +86,8 @@ find_library(LIB_GCC_PATH
 target_link_libraries(target_support PUBLIC ${LIB_C_PATH} ${LIB_M_PATH} ${LIB_GCC_PATH} ${LIB_NOSYS_PATH})
 # CC32XX dependencies
 target_link_libraries(target_support PUBLIC ${CC32XX_SDK_LIBS} cc32xx_common)
-## Propagate linker script
-target_link_libraries(target_support PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/app.ld)
+# Propagate linker script
+target_link_libraries(target_support PUBLIC -T${CMAKE_CURRENT_SOURCE_DIR}/app.ld)
 
 message(STATUS "WiFi AP: ${WIFI_SSID}")
 message(STATUS "WiFi Pass: ${WIFI_PASSWORD}")

From 2b0978961ab64cdca0fdc27fdbab1a674de62a3e Mon Sep 17 00:00:00 2001
From: sshapoval <serhii.shapoval@gmail.com>
Date: Mon, 18 Apr 2016 11:28:20 +0300
Subject: [PATCH 25/42] APP-68 Updated sample apps to import Kaa as a framework

---
 .../CellMonitorDemo.xcodeproj/project.pbxproj | 87 +++++++++++------
 .../contents.xcworkspacedata                  |  2 +-
 .../source/objc/CellMonitorDemo/AppDelegate.h |  3 +-
 .../source/objc/CellMonitorDemo/AppDelegate.m |  6 +-
 .../objc/CellMonitorDemo/ViewController.h     |  4 +-
 .../objc/CellMonitorDemo/ViewController.m     |  4 +
 .../project.pbxproj                           | 97 +++++++++++--------
 .../objc/ConfigurationDemo/AppDelegate.h      |  1 -
 .../objc/ConfigurationDemo/ViewController.h   |  1 -
 .../objc/ConfigurationDemo/ViewController.m   |  5 +-
 .../project.pbxproj                           | 97 +++++++++++--------
 .../objc/DataCollectionDemo/AppDelegate.h     |  1 -
 .../objc/DataCollectionDemo/ViewController.h  |  1 -
 .../objc/DataCollectionDemo/ViewController.m  |  5 +-
 .../objc/EventDemo.xcodeproj/project.pbxproj  | 96 ++++++++++--------
 eventdemo/source/objc/EventDemo/AppDelegate.h |  1 -
 eventdemo/source/objc/EventDemo/AppDelegate.m |  2 +-
 .../objc/EventDemo/Base.lproj/Main.storyboard |  8 +-
 .../source/objc/EventDemo/ViewController.h    |  1 -
 .../source/objc/EventDemo/ViewController.m    |  5 +-
 .../GPIOControlDemo.xcodeproj/project.pbxproj | 97 +++++++++++--------
 .../source/objc/GPIOControlDemo/AppDelegate.h |  1 -
 .../source/objc/GPIOControlDemo/AppDelegate.m |  2 +
 .../source/objc/GPIOControlDemo/Device.m      |  3 +-
 .../DevicesTableViewController.h              |  6 +-
 .../DevicesTableViewController.m              |  4 +-
 .../GPIOControlDemo/GPIOTableViewController.h |  3 +-
 .../GPIOControlDemo/GPIOTableViewController.m |  3 +
 .../source/objc/GPIOControlDemo/KaaProvider.h |  8 +-
 .../source/objc/GPIOControlDemo/KaaProvider.m | 14 +--
 .../project.pbxproj                           | 97 +++++++++++--------
 .../objc/NotificationDemo/AppDelegate.h       |  1 -
 .../objc/NotificationDemo/ViewController.h    |  1 -
 .../objc/NotificationDemo/ViewController.m    |  5 +-
 34 files changed, 398 insertions(+), 274 deletions(-)

diff --git a/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.pbxproj b/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.pbxproj
index 4fdbd206e..797207b73 100644
--- a/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.pbxproj
+++ b/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.pbxproj
@@ -14,17 +14,11 @@
 		39B345BD1C11986D00184BE0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39B345B41C11986D00184BE0 /* Main.storyboard */; };
 		39B345BF1C11986D00184BE0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 39B345B71C11986D00184BE0 /* main.m */; };
 		39B345C01C11986D00184BE0 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 39B345B91C11986D00184BE0 /* ViewController.m */; };
-		B82B6CDA1C1885E600B71A74 /* libKaa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B82B6CC21C18839600B71A74 /* libKaa.a */; };
+		C5E6A6071CC0F0190030707A /* Kaa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C51867DA1CBE86A6005165FE /* Kaa.framework */; };
+		C5E6A6161CC101D50030707A /* Kaa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C51867DA1CBE86A6005165FE /* Kaa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B82B6CC11C18839600B71A74 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B82B6CBC1C18839600B71A74 /* Kaa.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B824A1EB1B1452C50076C753;
-			remoteInfo = libKaa.a;
-		};
 		B82B6CC31C18839600B71A74 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B82B6CBC1C18839600B71A74 /* Kaa.xcodeproj */;
@@ -67,15 +61,42 @@
 			remoteGlobalIDString = 2F9F2BD61CE8A92314B98E03BBAE1DDD;
 			remoteInfo = "Pods-KaaTests";
 		};
-		B82B6CD81C18839F00B71A74 /* PBXContainerItemProxy */ = {
+		C51867D91CBE86A6005165FE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B82B6CBC1C18839600B71A74 /* Kaa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C5AAD8891CB7DC710046AA91;
+			remoteInfo = Kaa;
+		};
+		C51867E21CBE86A6005165FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B82B6CC51C18839E00B71A74 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0F0FFBAFF4293D5A7F4C81464719D20A;
-			remoteInfo = "Pods-libKaa.a";
+			remoteGlobalIDString = 0B2AEF7928285B60CFB19219147BC376;
+			remoteInfo = "Pods-Kaa";
+		};
+		C51867E41CBE86A6005165FE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B82B6CC51C18839E00B71A74 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A055D00B899A2917E39015C988A19A2C;
+			remoteInfo = sqlite3;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		C51867E91CBE86BA005165FE /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C5E6A6161CC101D50030707A /* Kaa.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		39796BF81C157D4E00BF91B2 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		39B345AF1C11986D00184BE0 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -97,8 +118,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B82B6CDA1C1885E600B71A74 /* libKaa.a in Frameworks */,
 				39796BF91C157D4E00BF91B2 /* CoreTelephony.framework in Frameworks */,
+				C5E6A6071CC0F0190030707A /* Kaa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -124,7 +145,7 @@
 		B82B6CBD1C18839600B71A74 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B82B6CC21C18839600B71A74 /* libKaa.a */,
+				C51867DA1CBE86A6005165FE /* Kaa.framework */,
 				B82B6CC41C18839600B71A74 /* KaaTests.xctest */,
 			);
 			name = Products;
@@ -137,8 +158,9 @@
 				B82B6CD11C18839F00B71A74 /* libCocoaLumberjack.a */,
 				B82B6CD31C18839F00B71A74 /* libOCHamcrest.a */,
 				B82B6CD51C18839F00B71A74 /* libOCMockito.a */,
+				C51867E31CBE86A6005165FE /* libPods-Kaa.a */,
 				B82B6CD71C18839F00B71A74 /* libPods-KaaTests.a */,
-				B82B6CD91C18839F00B71A74 /* libPods-libKaa.a.a */,
+				C51867E51CBE86A6005165FE /* libsqlite3.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -172,6 +194,7 @@
 				B8B9974C1BE3FB9600C0ABCE /* Sources */,
 				B8B9974D1BE3FB9600C0ABCE /* Frameworks */,
 				B8B9974E1BE3FB9600C0ABCE /* Resources */,
+				C51867E91CBE86BA005165FE /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -188,12 +211,11 @@
 		B8B997481BE3FB9600C0ABCE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = "CYBERVISION INC";
 				TargetAttributes = {
 					B8B9974F1BE3FB9600C0ABCE = {
 						CreatedOnToolsVersion = 7.0.1;
-						DevelopmentTeam = G8JGASHVD4;
 					};
 				};
 			};
@@ -226,13 +248,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B82B6CC21C18839600B71A74 /* libKaa.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libKaa.a;
-			remoteRef = B82B6CC11C18839600B71A74 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		B82B6CC41C18839600B71A74 /* KaaTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -275,11 +290,25 @@
 			remoteRef = B82B6CD61C18839F00B71A74 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B82B6CD91C18839F00B71A74 /* libPods-libKaa.a.a */ = {
+		C51867DA1CBE86A6005165FE /* Kaa.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Kaa.framework;
+			remoteRef = C51867D91CBE86A6005165FE /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C51867E31CBE86A6005165FE /* libPods-Kaa.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libPods-Kaa.a";
+			remoteRef = C51867E21CBE86A6005165FE /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C51867E51CBE86A6005165FE /* libsqlite3.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libPods-libKaa.a.a";
-			remoteRef = B82B6CD81C18839F00B71A74 /* PBXContainerItemProxy */;
+			path = libsqlite3.a;
+			remoteRef = C51867E41CBE86A6005165FE /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -334,6 +363,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -377,6 +407,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -415,12 +446,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/CellMonitorDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = CellMonitorDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Debug;
 		};
@@ -429,12 +460,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/CellMonitorDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = CellMonitorDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Release;
 		};
diff --git a/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 59fc0f721..919434a62 100644
--- a/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/cellmonitor/source/objc/CellMonitorDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self">
+      location = "self:">
    </FileRef>
 </Workspace>
diff --git a/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.h b/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.h
index df93eaadd..77464cdfe 100644
--- a/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.h
+++ b/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.h
@@ -15,7 +15,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <Kaa/Kaa.h>
+
+@protocol KaaClient;
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
diff --git a/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.m b/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.m
index bb9bceb5b..8deb76d74 100644
--- a/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.m
+++ b/cellmonitor/source/objc/CellMonitorDemo/AppDelegate.m
@@ -16,7 +16,9 @@
 
 #import "AppDelegate.h"
 #import "ViewController.h"
-#import "ProfileCommon.h"
+
+@import CoreLocation;
+@import Kaa;
 
 @interface AppDelegate () <KaaClientStateDelegate, ProfileContainer>
 
@@ -25,7 +27,7 @@ @interface AppDelegate () <KaaClientStateDelegate, ProfileContainer>
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    self.kaaClient = [Kaa clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
+    self.kaaClient = [KaaClientFactory clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
     [self.kaaClient setProfileContainer:self];
     return YES;
 }
diff --git a/cellmonitor/source/objc/CellMonitorDemo/ViewController.h b/cellmonitor/source/objc/CellMonitorDemo/ViewController.h
index 5f703da2b..9e17d0ffc 100644
--- a/cellmonitor/source/objc/CellMonitorDemo/ViewController.h
+++ b/cellmonitor/source/objc/CellMonitorDemo/ViewController.h
@@ -15,9 +15,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <Kaa/Kaa.h>
-
-@import CoreLocation;
+@class  CLLocationManager;
 
 @interface ViewController : UIViewController 
 
diff --git a/cellmonitor/source/objc/CellMonitorDemo/ViewController.m b/cellmonitor/source/objc/CellMonitorDemo/ViewController.m
index f309170d8..be7f21ff4 100644
--- a/cellmonitor/source/objc/CellMonitorDemo/ViewController.m
+++ b/cellmonitor/source/objc/CellMonitorDemo/ViewController.m
@@ -20,7 +20,9 @@
 #import "AppDelegate.h"
 #import "ViewController.h"
 
+@import CoreLocation;
 @import CoreTelephony;
+@import Kaa;
 
 static CLLocationManager *locationManager;
 
@@ -55,6 +57,8 @@ - (void)viewDidLoad {
     
     [self startUpdatingLocation];
     self.telephoneNetworkManager = [[CTTelephonyNetworkInfo alloc] init];
+
+    NSLog(@"Current thread %@", [[NSThread currentThread] debugDescription]);
     
     /*
      * Initialize the Kaa client using the Platform context.
diff --git a/configurationdemo/source/objc/ConfigurationDemo.xcodeproj/project.pbxproj b/configurationdemo/source/objc/ConfigurationDemo.xcodeproj/project.pbxproj
index 1fbb5f3e3..04c3b508c 100644
--- a/configurationdemo/source/objc/ConfigurationDemo.xcodeproj/project.pbxproj
+++ b/configurationdemo/source/objc/ConfigurationDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B80DFDDF1C188A0400B76119 /* libKaa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B80DFDC71C1889F400B76119 /* libKaa.a */; };
+		C5FAE9001CBF918F0070BDAA /* Kaa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5FAE8F41CBF918C0070BDAA /* Kaa.framework */; };
+		C5FAE9041CBF919C0070BDAA /* Kaa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C5FAE8F41CBF918C0070BDAA /* Kaa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E8290BD71C088EF400AA184A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E8290BCC1C088EF400AA184A /* AppDelegate.m */; };
 		E8290BD81C088EF400AA184A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8290BCD1C088EF400AA184A /* Assets.xcassets */; };
 		E8290BD91C088EF400AA184A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8290BCE1C088EF400AA184A /* LaunchScreen.storyboard */; };
@@ -17,13 +18,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B80DFDC61C1889F400B76119 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B80DFDC11C1889F400B76119 /* Kaa.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B824A1EB1B1452C50076C753;
-			remoteInfo = libKaa.a;
-		};
 		B80DFDC81C1889F400B76119 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B80DFDC11C1889F400B76119 /* Kaa.xcodeproj */;
@@ -66,22 +60,42 @@
 			remoteGlobalIDString = 2F9F2BD61CE8A92314B98E03BBAE1DDD;
 			remoteInfo = "Pods-KaaTests";
 		};
-		B80DFDDD1C1889FA00B76119 /* PBXContainerItemProxy */ = {
+		C5FAE8F31CBF918C0070BDAA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B80DFDC11C1889F400B76119 /* Kaa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C5AAD8891CB7DC710046AA91;
+			remoteInfo = Kaa;
+		};
+		C5FAE8FC1CBF918C0070BDAA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B80DFDCA1C1889FA00B76119 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0F0FFBAFF4293D5A7F4C81464719D20A;
-			remoteInfo = "Pods-libKaa.a";
+			remoteGlobalIDString = 0B2AEF7928285B60CFB19219147BC376;
+			remoteInfo = "Pods-Kaa";
 		};
-		B80DFDE01C188A0B00B76119 /* PBXContainerItemProxy */ = {
+		C5FAE8FE1CBF918C0070BDAA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = B80DFDC11C1889F400B76119 /* Kaa.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B824A1EA1B1452C50076C753;
-			remoteInfo = libKaa.a;
+			containerPortal = B80DFDCA1C1889FA00B76119 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A055D00B899A2917E39015C988A19A2C;
+			remoteInfo = sqlite3;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		C5FAE9031CBF91950070BDAA /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C5FAE9041CBF919C0070BDAA /* Kaa.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		B80DFDC11C1889F400B76119 /* Kaa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kaa.xcodeproj; path = "libs/kaa-ep-sdk/Kaa.xcodeproj"; sourceTree = "<group>"; };
 		B80DFDCA1C1889FA00B76119 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = "libs/kaa-ep-sdk/Pods/Pods.xcodeproj"; sourceTree = "<group>"; };
@@ -102,7 +116,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B80DFDDF1C188A0400B76119 /* libKaa.a in Frameworks */,
+				C5FAE9001CBF918F0070BDAA /* Kaa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,7 +126,7 @@
 		B80DFDC21C1889F400B76119 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B80DFDC71C1889F400B76119 /* libKaa.a */,
+				C5FAE8F41CBF918C0070BDAA /* Kaa.framework */,
 				B80DFDC91C1889F400B76119 /* KaaTests.xctest */,
 			);
 			name = Products;
@@ -125,8 +139,9 @@
 				B80DFDD61C1889FA00B76119 /* libCocoaLumberjack.a */,
 				B80DFDD81C1889FA00B76119 /* libOCHamcrest.a */,
 				B80DFDDA1C1889FA00B76119 /* libOCMockito.a */,
+				C5FAE8FD1CBF918C0070BDAA /* libPods-Kaa.a */,
 				B80DFDDC1C1889FA00B76119 /* libPods-KaaTests.a */,
-				B80DFDDE1C1889FA00B76119 /* libPods-libKaa.a.a */,
+				C5FAE8FF1CBF918C0070BDAA /* libsqlite3.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -175,11 +190,11 @@
 				B8B9974C1BE3FB9600C0ABCE /* Sources */,
 				B8B9974D1BE3FB9600C0ABCE /* Frameworks */,
 				B8B9974E1BE3FB9600C0ABCE /* Resources */,
+				C5FAE9031CBF91950070BDAA /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B80DFDE11C188A0B00B76119 /* PBXTargetDependency */,
 			);
 			name = ConfigurationDemo;
 			productName = EventDemo;
@@ -197,7 +212,6 @@
 				TargetAttributes = {
 					B8B9974F1BE3FB9600C0ABCE = {
 						CreatedOnToolsVersion = 7.0.1;
-						DevelopmentTeam = G8JGASHVD4;
 					};
 				};
 			};
@@ -230,13 +244,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B80DFDC71C1889F400B76119 /* libKaa.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libKaa.a;
-			remoteRef = B80DFDC61C1889F400B76119 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		B80DFDC91C1889F400B76119 /* KaaTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -279,11 +286,25 @@
 			remoteRef = B80DFDDB1C1889FA00B76119 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B80DFDDE1C1889FA00B76119 /* libPods-libKaa.a.a */ = {
+		C5FAE8F41CBF918C0070BDAA /* Kaa.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Kaa.framework;
+			remoteRef = C5FAE8F31CBF918C0070BDAA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C5FAE8FD1CBF918C0070BDAA /* libPods-Kaa.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libPods-libKaa.a.a";
-			remoteRef = B80DFDDD1C1889FA00B76119 /* PBXContainerItemProxy */;
+			path = "libPods-Kaa.a";
+			remoteRef = C5FAE8FC1CBF918C0070BDAA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C5FAE8FF1CBF918C0070BDAA /* libsqlite3.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsqlite3.a;
+			remoteRef = C5FAE8FE1CBF918C0070BDAA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -314,14 +335,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B80DFDE11C188A0B00B76119 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = libKaa.a;
-			targetProxy = B80DFDE01C188A0B00B76119 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		E8290BCE1C088EF400AA184A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -346,6 +359,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -389,6 +403,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -427,12 +442,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/ConfigurationDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = ConfigurationDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Debug;
 		};
@@ -441,12 +456,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/ConfigurationDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = ConfigurationDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Release;
 		};
diff --git a/configurationdemo/source/objc/ConfigurationDemo/AppDelegate.h b/configurationdemo/source/objc/ConfigurationDemo/AppDelegate.h
index b8eec0fc1..4edeb741d 100644
--- a/configurationdemo/source/objc/ConfigurationDemo/AppDelegate.h
+++ b/configurationdemo/source/objc/ConfigurationDemo/AppDelegate.h
@@ -20,6 +20,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
 @end
 
diff --git a/configurationdemo/source/objc/ConfigurationDemo/ViewController.h b/configurationdemo/source/objc/ConfigurationDemo/ViewController.h
index ef465bc14..8f4ee9c37 100644
--- a/configurationdemo/source/objc/ConfigurationDemo/ViewController.h
+++ b/configurationdemo/source/objc/ConfigurationDemo/ViewController.h
@@ -18,6 +18,5 @@
 
 @interface ViewController : UIViewController
 
-
 @end
 
diff --git a/configurationdemo/source/objc/ConfigurationDemo/ViewController.m b/configurationdemo/source/objc/ConfigurationDemo/ViewController.m
index d72a40e1b..4974f3a13 100644
--- a/configurationdemo/source/objc/ConfigurationDemo/ViewController.m
+++ b/configurationdemo/source/objc/ConfigurationDemo/ViewController.m
@@ -15,7 +15,8 @@
  */
 
 #import "ViewController.h"
-#import <Kaa/Kaa.h>
+
+@import Kaa;
 
 @interface ViewController () <KaaClientStateDelegate, ConfigurationDelegate, ProfileContainer>
 
@@ -34,7 +35,7 @@ - (void)viewDidLoad {
 
     // Create a Kaa client and add a listener which displays the Kaa client configuration
     // as soon as the Kaa client is started.
-    self.kaaClient = [Kaa clientWithStateDelegate:self];
+    self.kaaClient = [KaaClientFactory clientWithStateDelegate:self];
     
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *configurationPath = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"savedconfig.cfg"];
diff --git a/datacollectiondemo/source/objc/DataCollectionDemo.xcodeproj/project.pbxproj b/datacollectiondemo/source/objc/DataCollectionDemo.xcodeproj/project.pbxproj
index bc7a91b9a..f0a68820b 100644
--- a/datacollectiondemo/source/objc/DataCollectionDemo.xcodeproj/project.pbxproj
+++ b/datacollectiondemo/source/objc/DataCollectionDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B878248C1C188B4700F12E02 /* libKaa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B87824741C188B3400F12E02 /* libKaa.a */; };
+		C55252A61CC1381600C19145 /* Kaa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C552529A1CC137E300C19145 /* Kaa.framework */; };
+		C55252A81CC1381F00C19145 /* Kaa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C552529A1CC137E300C19145 /* Kaa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E8290B251C0888DA00AA184A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E8290B1B1C0888DA00AA184A /* AppDelegate.m */; };
 		E8290B261C0888DA00AA184A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8290B1C1C0888DA00AA184A /* Assets.xcassets */; };
 		E8290B271C0888DA00AA184A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8290B1D1C0888DA00AA184A /* LaunchScreen.storyboard */; };
@@ -17,13 +18,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B87824731C188B3400F12E02 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B878246E1C188B3400F12E02 /* Kaa.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B824A1EB1B1452C50076C753;
-			remoteInfo = libKaa.a;
-		};
 		B87824751C188B3400F12E02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B878246E1C188B3400F12E02 /* Kaa.xcodeproj */;
@@ -66,22 +60,42 @@
 			remoteGlobalIDString = 2F9F2BD61CE8A92314B98E03BBAE1DDD;
 			remoteInfo = "Pods-KaaTests";
 		};
-		B878248A1C188B3800F12E02 /* PBXContainerItemProxy */ = {
+		C55252991CC137E300C19145 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B878246E1C188B3400F12E02 /* Kaa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C5AAD8891CB7DC710046AA91;
+			remoteInfo = Kaa;
+		};
+		C55252A21CC137E300C19145 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B87824771C188B3800F12E02 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0F0FFBAFF4293D5A7F4C81464719D20A;
-			remoteInfo = "Pods-libKaa.a";
+			remoteGlobalIDString = 0B2AEF7928285B60CFB19219147BC376;
+			remoteInfo = "Pods-Kaa";
 		};
-		B878248D1C188B4F00F12E02 /* PBXContainerItemProxy */ = {
+		C55252A41CC137E300C19145 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = B878246E1C188B3400F12E02 /* Kaa.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B824A1EA1B1452C50076C753;
-			remoteInfo = libKaa.a;
+			containerPortal = B87824771C188B3800F12E02 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A055D00B899A2917E39015C988A19A2C;
+			remoteInfo = sqlite3;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		C55252A71CC1381800C19145 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C55252A81CC1381F00C19145 /* Kaa.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		B878246E1C188B3400F12E02 /* Kaa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kaa.xcodeproj; path = "libs/kaa-ep-sdk/Kaa.xcodeproj"; sourceTree = "<group>"; };
 		B87824771C188B3800F12E02 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = "libs/kaa-ep-sdk/Pods/Pods.xcodeproj"; sourceTree = "<group>"; };
@@ -102,7 +116,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B878248C1C188B4700F12E02 /* libKaa.a in Frameworks */,
+				C55252A61CC1381600C19145 /* Kaa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,7 +126,7 @@
 		B878246F1C188B3400F12E02 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B87824741C188B3400F12E02 /* libKaa.a */,
+				C552529A1CC137E300C19145 /* Kaa.framework */,
 				B87824761C188B3400F12E02 /* KaaTests.xctest */,
 			);
 			name = Products;
@@ -125,8 +139,9 @@
 				B87824831C188B3800F12E02 /* libCocoaLumberjack.a */,
 				B87824851C188B3800F12E02 /* libOCHamcrest.a */,
 				B87824871C188B3800F12E02 /* libOCMockito.a */,
+				C55252A31CC137E300C19145 /* libPods-Kaa.a */,
 				B87824891C188B3800F12E02 /* libPods-KaaTests.a */,
-				B878248B1C188B3800F12E02 /* libPods-libKaa.a.a */,
+				C55252A51CC137E300C19145 /* libsqlite3.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -175,11 +190,11 @@
 				B8B9974C1BE3FB9600C0ABCE /* Sources */,
 				B8B9974D1BE3FB9600C0ABCE /* Frameworks */,
 				B8B9974E1BE3FB9600C0ABCE /* Resources */,
+				C55252A71CC1381800C19145 /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B878248E1C188B4F00F12E02 /* PBXTargetDependency */,
 			);
 			name = DataCollectionDemo;
 			productName = EventDemo;
@@ -197,7 +212,6 @@
 				TargetAttributes = {
 					B8B9974F1BE3FB9600C0ABCE = {
 						CreatedOnToolsVersion = 7.0.1;
-						DevelopmentTeam = G8JGASHVD4;
 					};
 				};
 			};
@@ -230,13 +244,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B87824741C188B3400F12E02 /* libKaa.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libKaa.a;
-			remoteRef = B87824731C188B3400F12E02 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		B87824761C188B3400F12E02 /* KaaTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -279,11 +286,25 @@
 			remoteRef = B87824881C188B3800F12E02 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B878248B1C188B3800F12E02 /* libPods-libKaa.a.a */ = {
+		C552529A1CC137E300C19145 /* Kaa.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Kaa.framework;
+			remoteRef = C55252991CC137E300C19145 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C55252A31CC137E300C19145 /* libPods-Kaa.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libPods-libKaa.a.a";
-			remoteRef = B878248A1C188B3800F12E02 /* PBXContainerItemProxy */;
+			path = "libPods-Kaa.a";
+			remoteRef = C55252A21CC137E300C19145 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C55252A51CC137E300C19145 /* libsqlite3.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsqlite3.a;
+			remoteRef = C55252A41CC137E300C19145 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -314,14 +335,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B878248E1C188B4F00F12E02 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = libKaa.a;
-			targetProxy = B878248D1C188B4F00F12E02 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		E8290B1D1C0888DA00AA184A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -346,6 +359,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -389,6 +403,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -427,12 +442,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/DataCollectionDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = DataCollectionDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Debug;
 		};
@@ -441,12 +456,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/DataCollectionDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = DataCollectionDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Release;
 		};
diff --git a/datacollectiondemo/source/objc/DataCollectionDemo/AppDelegate.h b/datacollectiondemo/source/objc/DataCollectionDemo/AppDelegate.h
index b8eec0fc1..4edeb741d 100644
--- a/datacollectiondemo/source/objc/DataCollectionDemo/AppDelegate.h
+++ b/datacollectiondemo/source/objc/DataCollectionDemo/AppDelegate.h
@@ -20,6 +20,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
 @end
 
diff --git a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.h b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.h
index ef465bc14..8f4ee9c37 100644
--- a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.h
+++ b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.h
@@ -18,6 +18,5 @@
 
 @interface ViewController : UIViewController
 
-
 @end
 
diff --git a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
index c84595ca7..b530bec3b 100644
--- a/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
+++ b/datacollectiondemo/source/objc/DataCollectionDemo/ViewController.m
@@ -15,7 +15,8 @@
  */
 
 #import "ViewController.h"
-#import <Kaa/Kaa.h>
+
+@import Kaa;
 
 #define LOGS_TO_SEND_COUNT 5
 
@@ -37,7 +38,7 @@ - (void)viewDidLoad {
     [self addLogWithText:@"DataCollectionDemo started"];
     
     //Create a Kaa client with the Kaa default context.
-    self.kaaClient = [Kaa clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
+    self.kaaClient = [KaaClientFactory clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
     
     // Set a custom strategy for uploading logs.
     // The default strategy uploads logs after either a threshold logs count
diff --git a/eventdemo/source/objc/EventDemo.xcodeproj/project.pbxproj b/eventdemo/source/objc/EventDemo.xcodeproj/project.pbxproj
index defb8a04a..523d56ca3 100644
--- a/eventdemo/source/objc/EventDemo.xcodeproj/project.pbxproj
+++ b/eventdemo/source/objc/EventDemo.xcodeproj/project.pbxproj
@@ -7,23 +7,17 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B87824B11C188EF700F12E02 /* libKaa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B87824991C188EE700F12E02 /* libKaa.a */; };
 		B8B997551BE3FB9600C0ABCE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B8B997541BE3FB9600C0ABCE /* main.m */; };
 		B8B997581BE3FB9600C0ABCE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B8B997571BE3FB9600C0ABCE /* AppDelegate.m */; };
 		B8B9975B1BE3FB9600C0ABCE /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B8B9975A1BE3FB9600C0ABCE /* ViewController.m */; };
 		B8B9975E1BE3FB9600C0ABCE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B8B9975C1BE3FB9600C0ABCE /* Main.storyboard */; };
 		B8B997601BE3FB9600C0ABCE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B8B9975F1BE3FB9600C0ABCE /* Assets.xcassets */; };
 		B8B997631BE3FB9600C0ABCE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B8B997611BE3FB9600C0ABCE /* LaunchScreen.storyboard */; };
+		C518F5731CC139E2004F67B4 /* Kaa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C518F5671CC139DF004F67B4 /* Kaa.framework */; };
+		C518F5751CC139F8004F67B4 /* Kaa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C518F5671CC139DF004F67B4 /* Kaa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B87824981C188EE700F12E02 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B87824931C188EE700F12E02 /* Kaa.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B824A1EB1B1452C50076C753;
-			remoteInfo = libKaa.a;
-		};
 		B878249A1C188EE700F12E02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B87824931C188EE700F12E02 /* Kaa.xcodeproj */;
@@ -66,22 +60,42 @@
 			remoteGlobalIDString = 2F9F2BD61CE8A92314B98E03BBAE1DDD;
 			remoteInfo = "Pods-KaaTests";
 		};
-		B87824AF1C188EF000F12E02 /* PBXContainerItemProxy */ = {
+		C518F5661CC139DF004F67B4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B87824931C188EE700F12E02 /* Kaa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C5AAD8891CB7DC710046AA91;
+			remoteInfo = Kaa;
+		};
+		C518F56F1CC139DF004F67B4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B878249C1C188EF000F12E02 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0F0FFBAFF4293D5A7F4C81464719D20A;
-			remoteInfo = "Pods-libKaa.a";
+			remoteGlobalIDString = 0B2AEF7928285B60CFB19219147BC376;
+			remoteInfo = "Pods-Kaa";
 		};
-		B87824B21C188EFF00F12E02 /* PBXContainerItemProxy */ = {
+		C518F5711CC139DF004F67B4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = B87824931C188EE700F12E02 /* Kaa.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B824A1EA1B1452C50076C753;
-			remoteInfo = libKaa.a;
+			containerPortal = B878249C1C188EF000F12E02 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A055D00B899A2917E39015C988A19A2C;
+			remoteInfo = sqlite3;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		C518F5741CC139F2004F67B4 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C518F5751CC139F8004F67B4 /* Kaa.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		B87824931C188EE700F12E02 /* Kaa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kaa.xcodeproj; path = "libs/kaa-ep-sdk/Kaa.xcodeproj"; sourceTree = "<group>"; };
 		B878249C1C188EF000F12E02 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = "libs/kaa-ep-sdk/Pods/Pods.xcodeproj"; sourceTree = "<group>"; };
@@ -102,7 +116,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B87824B11C188EF700F12E02 /* libKaa.a in Frameworks */,
+				C518F5731CC139E2004F67B4 /* Kaa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,7 +126,7 @@
 		B87824941C188EE700F12E02 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B87824991C188EE700F12E02 /* libKaa.a */,
+				C518F5671CC139DF004F67B4 /* Kaa.framework */,
 				B878249B1C188EE700F12E02 /* KaaTests.xctest */,
 			);
 			name = Products;
@@ -125,8 +139,9 @@
 				B87824A81C188EF000F12E02 /* libCocoaLumberjack.a */,
 				B87824AA1C188EF000F12E02 /* libOCHamcrest.a */,
 				B87824AC1C188EF000F12E02 /* libOCMockito.a */,
+				C518F5701CC139DF004F67B4 /* libPods-Kaa.a */,
 				B87824AE1C188EF000F12E02 /* libPods-KaaTests.a */,
-				B87824B01C188EF000F12E02 /* libPods-libKaa.a.a */,
+				C518F5721CC139DF004F67B4 /* libsqlite3.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -183,11 +198,11 @@
 				B8B9974C1BE3FB9600C0ABCE /* Sources */,
 				B8B9974D1BE3FB9600C0ABCE /* Frameworks */,
 				B8B9974E1BE3FB9600C0ABCE /* Resources */,
+				C518F5741CC139F2004F67B4 /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B87824B31C188EFF00F12E02 /* PBXTargetDependency */,
 			);
 			name = EventDemo;
 			productName = EventDemo;
@@ -237,13 +252,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B87824991C188EE700F12E02 /* libKaa.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libKaa.a;
-			remoteRef = B87824981C188EE700F12E02 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		B878249B1C188EE700F12E02 /* KaaTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -286,11 +294,25 @@
 			remoteRef = B87824AD1C188EF000F12E02 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B87824B01C188EF000F12E02 /* libPods-libKaa.a.a */ = {
+		C518F5671CC139DF004F67B4 /* Kaa.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Kaa.framework;
+			remoteRef = C518F5661CC139DF004F67B4 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C518F5701CC139DF004F67B4 /* libPods-Kaa.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libPods-libKaa.a.a";
-			remoteRef = B87824AF1C188EF000F12E02 /* PBXContainerItemProxy */;
+			path = "libPods-Kaa.a";
+			remoteRef = C518F56F1CC139DF004F67B4 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C518F5721CC139DF004F67B4 /* libsqlite3.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsqlite3.a;
+			remoteRef = C518F5711CC139DF004F67B4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -321,14 +343,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B87824B31C188EFF00F12E02 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = libKaa.a;
-			targetProxy = B87824B21C188EFF00F12E02 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		B8B9975C1BE3FB9600C0ABCE /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -353,6 +367,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -396,6 +411,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -433,13 +449,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = EventDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Debug;
 		};
@@ -447,13 +463,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = EventDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Release;
 		};
diff --git a/eventdemo/source/objc/EventDemo/AppDelegate.h b/eventdemo/source/objc/EventDemo/AppDelegate.h
index b8eec0fc1..4edeb741d 100644
--- a/eventdemo/source/objc/EventDemo/AppDelegate.h
+++ b/eventdemo/source/objc/EventDemo/AppDelegate.h
@@ -20,6 +20,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
 @end
 
diff --git a/eventdemo/source/objc/EventDemo/AppDelegate.m b/eventdemo/source/objc/EventDemo/AppDelegate.m
index 1e5743c9e..28355053f 100644
--- a/eventdemo/source/objc/EventDemo/AppDelegate.m
+++ b/eventdemo/source/objc/EventDemo/AppDelegate.m
@@ -16,8 +16,8 @@
 
 #import "AppDelegate.h"
 
-
 @interface AppDelegate ()
+
 @end
 
 @implementation AppDelegate
diff --git a/eventdemo/source/objc/EventDemo/Base.lproj/Main.storyboard b/eventdemo/source/objc/EventDemo/Base.lproj/Main.storyboard
index b3a633232..97ab9d997 100644
--- a/eventdemo/source/objc/EventDemo/Base.lproj/Main.storyboard
+++ b/eventdemo/source/objc/EventDemo/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
@@ -20,14 +20,12 @@
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="AVD-d3-xZD">
                                 <rect key="frame" x="0.0" y="20" width="600" height="580"/>
-                                <animations/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="AVD-d3-xZD" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" id="4JV-QY-prh"/>
diff --git a/eventdemo/source/objc/EventDemo/ViewController.h b/eventdemo/source/objc/EventDemo/ViewController.h
index ef465bc14..8f4ee9c37 100644
--- a/eventdemo/source/objc/EventDemo/ViewController.h
+++ b/eventdemo/source/objc/EventDemo/ViewController.h
@@ -18,6 +18,5 @@
 
 @interface ViewController : UIViewController
 
-
 @end
 
diff --git a/eventdemo/source/objc/EventDemo/ViewController.m b/eventdemo/source/objc/EventDemo/ViewController.m
index 767a56206..ee5517a26 100644
--- a/eventdemo/source/objc/EventDemo/ViewController.m
+++ b/eventdemo/source/objc/EventDemo/ViewController.m
@@ -15,7 +15,8 @@
  */
 
 #import "ViewController.h"
-#import <Kaa/Kaa.h>
+
+@import Kaa;
 
 #define USER_EXTERNAL_ID    @"user@email.com"
 #define USER_ACCESS_TOKEN   @"token"
@@ -40,7 +41,7 @@ - (void)viewDidLoad {
     [self addLogWithText:@"Event demo started"];
     
     //Create a Kaa client with the Kaa default context.
-    self.kaaClient = [Kaa clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
+    self.kaaClient = [KaaClientFactory clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
     [self.kaaClient setProfileContainer:self];
     
     // Start the Kaa client and connect it to the Kaa server.
diff --git a/gpiocontrol/source/objc/GPIOControlDemo.xcodeproj/project.pbxproj b/gpiocontrol/source/objc/GPIOControlDemo.xcodeproj/project.pbxproj
index 681a41eb2..6a095e082 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo.xcodeproj/project.pbxproj
+++ b/gpiocontrol/source/objc/GPIOControlDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B87824D21C18900E00F12E02 /* libKaa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B87824BA1C18900100F12E02 /* libKaa.a */; };
+		C571EFBC1CC13B79000FFDD2 /* Kaa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C571EFB01CC13B77000FFDD2 /* Kaa.framework */; };
+		C571EFBE1CC13B82000FFDD2 /* Kaa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C571EFB01CC13B77000FFDD2 /* Kaa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E8290BB71C088CAA00AA184A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E8290BA01C088CAA00AA184A /* AppDelegate.m */; };
 		E8290BB81C088CAA00AA184A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8290BA11C088CAA00AA184A /* Assets.xcassets */; };
 		E8290BB91C088CAA00AA184A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8290BA21C088CAA00AA184A /* LaunchScreen.storyboard */; };
@@ -23,13 +24,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B87824B91C18900100F12E02 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B87824B41C18900100F12E02 /* Kaa.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B824A1EB1B1452C50076C753;
-			remoteInfo = libKaa.a;
-		};
 		B87824BB1C18900100F12E02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B87824B41C18900100F12E02 /* Kaa.xcodeproj */;
@@ -72,22 +66,42 @@
 			remoteGlobalIDString = 2F9F2BD61CE8A92314B98E03BBAE1DDD;
 			remoteInfo = "Pods-KaaTests";
 		};
-		B87824D01C18900600F12E02 /* PBXContainerItemProxy */ = {
+		C571EFAF1CC13B77000FFDD2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B87824B41C18900100F12E02 /* Kaa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C5AAD8891CB7DC710046AA91;
+			remoteInfo = Kaa;
+		};
+		C571EFB81CC13B77000FFDD2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B87824BD1C18900600F12E02 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0F0FFBAFF4293D5A7F4C81464719D20A;
-			remoteInfo = "Pods-libKaa.a";
+			remoteGlobalIDString = 0B2AEF7928285B60CFB19219147BC376;
+			remoteInfo = "Pods-Kaa";
 		};
-		B87824D31C18901100F12E02 /* PBXContainerItemProxy */ = {
+		C571EFBA1CC13B77000FFDD2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = B87824B41C18900100F12E02 /* Kaa.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B824A1EA1B1452C50076C753;
-			remoteInfo = libKaa.a;
+			containerPortal = B87824BD1C18900600F12E02 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A055D00B899A2917E39015C988A19A2C;
+			remoteInfo = sqlite3;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		C571EFBD1CC13B7B000FFDD2 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C571EFBE1CC13B82000FFDD2 /* Kaa.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		B87824B41C18900100F12E02 /* Kaa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kaa.xcodeproj; path = "libs/kaa-ep-sdk/Kaa.xcodeproj"; sourceTree = "<group>"; };
 		B87824BD1C18900600F12E02 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = "libs/kaa-ep-sdk/Pods/Pods.xcodeproj"; sourceTree = "<group>"; };
@@ -120,7 +134,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B87824D21C18900E00F12E02 /* libKaa.a in Frameworks */,
+				C571EFBC1CC13B79000FFDD2 /* Kaa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -130,7 +144,7 @@
 		B87824B51C18900100F12E02 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B87824BA1C18900100F12E02 /* libKaa.a */,
+				C571EFB01CC13B77000FFDD2 /* Kaa.framework */,
 				B87824BC1C18900100F12E02 /* KaaTests.xctest */,
 			);
 			name = Products;
@@ -143,8 +157,9 @@
 				B87824C91C18900600F12E02 /* libCocoaLumberjack.a */,
 				B87824CB1C18900600F12E02 /* libOCHamcrest.a */,
 				B87824CD1C18900600F12E02 /* libOCMockito.a */,
+				C571EFB91CC13B77000FFDD2 /* libPods-Kaa.a */,
 				B87824CF1C18900600F12E02 /* libPods-KaaTests.a */,
-				B87824D11C18900600F12E02 /* libPods-libKaa.a.a */,
+				C571EFBB1CC13B77000FFDD2 /* libsqlite3.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -205,11 +220,11 @@
 				B8B9974C1BE3FB9600C0ABCE /* Sources */,
 				B8B9974D1BE3FB9600C0ABCE /* Frameworks */,
 				B8B9974E1BE3FB9600C0ABCE /* Resources */,
+				C571EFBD1CC13B7B000FFDD2 /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B87824D41C18901100F12E02 /* PBXTargetDependency */,
 			);
 			name = GPIOControlDemo;
 			productName = EventDemo;
@@ -227,7 +242,6 @@
 				TargetAttributes = {
 					B8B9974F1BE3FB9600C0ABCE = {
 						CreatedOnToolsVersion = 7.0.1;
-						DevelopmentTeam = G8JGASHVD4;
 					};
 				};
 			};
@@ -260,13 +274,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B87824BA1C18900100F12E02 /* libKaa.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libKaa.a;
-			remoteRef = B87824B91C18900100F12E02 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		B87824BC1C18900100F12E02 /* KaaTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -309,11 +316,25 @@
 			remoteRef = B87824CE1C18900600F12E02 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B87824D11C18900600F12E02 /* libPods-libKaa.a.a */ = {
+		C571EFB01CC13B77000FFDD2 /* Kaa.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Kaa.framework;
+			remoteRef = C571EFAF1CC13B77000FFDD2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C571EFB91CC13B77000FFDD2 /* libPods-Kaa.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libPods-libKaa.a.a";
-			remoteRef = B87824D01C18900600F12E02 /* PBXContainerItemProxy */;
+			path = "libPods-Kaa.a";
+			remoteRef = C571EFB81CC13B77000FFDD2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C571EFBB1CC13B77000FFDD2 /* libsqlite3.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsqlite3.a;
+			remoteRef = C571EFBA1CC13B77000FFDD2 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -350,14 +371,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B87824D41C18901100F12E02 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = libKaa.a;
-			targetProxy = B87824D31C18901100F12E02 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		E8290BA21C088CAA00AA184A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -382,6 +395,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -425,6 +439,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -463,12 +478,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/GPIOControlDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = GPIOControlDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Debug;
 		};
@@ -477,12 +492,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/GPIOControlDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = GPIOControlDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Release;
 		};
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.h b/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.h
index b8eec0fc1..4edeb741d 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.h
+++ b/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.h
@@ -20,6 +20,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
 @end
 
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.m b/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.m
index 1695e46a1..6b377321c 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.m
+++ b/gpiocontrol/source/objc/GPIOControlDemo/AppDelegate.m
@@ -17,6 +17,8 @@
 #import "AppDelegate.h"
 #import "KaaProvider.h"
 
+@import Kaa;
+
 @interface AppDelegate ()
 
 @end
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/Device.m b/gpiocontrol/source/objc/GPIOControlDemo/Device.m
index 2c8543d27..d743cb47d 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/Device.m
+++ b/gpiocontrol/source/objc/GPIOControlDemo/Device.m
@@ -15,7 +15,8 @@
  */
 
 #import "Device.h"
-#import <Kaa/Kaa.h>
+
+@import Kaa;
 
 @implementation Device
 
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.h b/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.h
index 054d24f9a..30b05b8c7 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.h
+++ b/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.h
@@ -15,7 +15,11 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <Kaa/Kaa.h>
+
+@protocol ProfileContainer;
+@protocol RemoteControlECFDelegate;
+@protocol OnDetachEndpointOperationDelegate;
+@protocol OnAttachEndpointOperationDelegate;
 
 @interface DevicesTableViewController : UITableViewController <ProfileContainer, RemoteControlECFDelegate, OnDetachEndpointOperationDelegate, OnAttachEndpointOperationDelegate>
 
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.m b/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.m
index 54092512c..4c3fe9510 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.m
+++ b/gpiocontrol/source/objc/GPIOControlDemo/DevicesTableViewController.m
@@ -21,6 +21,8 @@
 #import "ConnectionAlert.h"
 #import "GPIOTableViewController.h"
 
+@import Kaa;
+
 #define TAG @"DevicesTableViewController"
 
 @interface DevicesTableViewController ()
@@ -170,7 +172,7 @@ - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)
 
 - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
     if (editingStyle == UITableViewCellEditingStyleDelete) {
-        id <KaaClient> kaaClient = [KaaProvider getClient];
+        id<KaaClient> kaaClient = [KaaProvider getClient];
         NSLog(@"%@ Going to detach.", TAG);
         Device *currentDevice = self.devices[indexPath.row];
         self.deletingIndexPath = indexPath;
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.h b/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.h
index df3a8b7f4..9ad0f5452 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.h
+++ b/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.h
@@ -15,7 +15,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import "Device.h"
+
+@class Device;
 
 @interface GPIOTableViewController : UITableViewController <UITabBarDelegate, UITableViewDataSource>
 
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.m b/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.m
index a2ade9a5a..f0d02a19d 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.m
+++ b/gpiocontrol/source/objc/GPIOControlDemo/GPIOTableViewController.m
@@ -18,6 +18,9 @@
 #import "StatusTableViewCell.h"
 #import "KaaProvider.h"
 #import "ConnectionAlert.h"
+#import "Device.h"
+
+@import Kaa;
 
 @interface GPIOTableViewController ()
 
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.h b/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.h
index 606d86b5b..6760e93ec 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.h
+++ b/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.h
@@ -15,7 +15,11 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <Kaa/Kaa.h>
+
+@protocol KaaClientStateDelegate;
+@protocol UserAttachDelegate;
+@protocol KaaClient;
+@protocol RemoteControlECFDelegate;
 
 @interface ConcreteStateDelegate : NSObject <KaaClientStateDelegate>
 
@@ -27,7 +31,7 @@
 
 + (id<KaaClient>)getClient;
 - (void)attachUser;
-+ (void)setUpEventDelegate:(id <RemoteControlECFDelegate>)delegate;
++ (void)setUpEventDelegate:(id<RemoteControlECFDelegate>)delegate;
 + (void)sendDeviceInfoRequestToAll;
 
 @end
diff --git a/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.m b/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.m
index 71f5ccbc4..e9258575c 100644
--- a/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.m
+++ b/gpiocontrol/source/objc/GPIOControlDemo/KaaProvider.m
@@ -17,6 +17,8 @@
 #import "KaaProvider.h"
 #import "PreferencesManager.h"
 
+@import Kaa;
+
 @implementation ConcreteStateDelegate
 
 - (void)onStarted{
@@ -48,22 +50,22 @@ - (void)onStopFailureWithException:(NSException *)exception {
 
 @implementation KaaProvider
 
-+ (id <KaaClient>)getClient {
-    static id <KaaClient> kaaClient = nil;
++ (id<KaaClient>)getClient {
+    static id<KaaClient> kaaClient = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        kaaClient = [Kaa clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:[[ConcreteStateDelegate alloc] init]];
+        kaaClient = [KaaClientFactory clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:[[ConcreteStateDelegate alloc] init]];
     });
     return kaaClient;
 }
 
 - (void)attachUser {
-    id <KaaClient> client = [KaaProvider getClient];
+    id<KaaClient> client = [KaaProvider getClient];
     [client attachUserWithId:[PreferencesManager getUserExternalId] accessToken:[PreferencesManager getUserAccessToken] delegate:self];
 }
 
 + (void)setUpEventDelegate:(id <RemoteControlECFDelegate>)delegate {
-    id <KaaClient> client = [self getClient];
+    id<KaaClient> client = [self getClient];
     EventFamilyFactory *eventFamilyFactory = [client getEventFamilyFactory];
     RemoteControlECF *ecf = [eventFamilyFactory getRemoteControlECF];
     
@@ -72,7 +74,7 @@ + (void)setUpEventDelegate:(id <RemoteControlECFDelegate>)delegate {
 }
 
 + (void)sendDeviceInfoRequestToAll {
-    id <KaaClient> client = [self getClient];
+    id<KaaClient> client = [self getClient];
     EventFamilyFactory *eventFamilyFactory = [client getEventFamilyFactory];
     RemoteControlECF *ecf = [eventFamilyFactory getRemoteControlECF];
     
diff --git a/notificationdemo/source/objc/NotificationDemo.xcodeproj/project.pbxproj b/notificationdemo/source/objc/NotificationDemo.xcodeproj/project.pbxproj
index e2ec4ea76..fe40a0a65 100644
--- a/notificationdemo/source/objc/NotificationDemo.xcodeproj/project.pbxproj
+++ b/notificationdemo/source/objc/NotificationDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B87824F51C18921600F12E02 /* libKaa.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B87824DD1C1891D100F12E02 /* libKaa.a */; };
+		C56924611CC13E150057417B /* Kaa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C56924551CC13E0D0057417B /* Kaa.framework */; };
+		C56924631CC13E1D0057417B /* Kaa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C56924551CC13E0D0057417B /* Kaa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E8290AD41C08845700AA184A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E8290AC91C08845700AA184A /* AppDelegate.m */; };
 		E8290AD51C08845700AA184A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8290ACA1C08845700AA184A /* Assets.xcassets */; };
 		E8290AD61C08845700AA184A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8290ACB1C08845700AA184A /* LaunchScreen.storyboard */; };
@@ -17,13 +18,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B87824DC1C1891D100F12E02 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B87824D71C1891D100F12E02 /* Kaa.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = B824A1EB1B1452C50076C753;
-			remoteInfo = libKaa.a;
-		};
 		B87824DE1C1891D100F12E02 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B87824D71C1891D100F12E02 /* Kaa.xcodeproj */;
@@ -66,22 +60,42 @@
 			remoteGlobalIDString = 2F9F2BD61CE8A92314B98E03BBAE1DDD;
 			remoteInfo = "Pods-KaaTests";
 		};
-		B87824F31C1891D900F12E02 /* PBXContainerItemProxy */ = {
+		C56924541CC13E0D0057417B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B87824D71C1891D100F12E02 /* Kaa.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C5AAD8891CB7DC710046AA91;
+			remoteInfo = Kaa;
+		};
+		C569245D1CC13E0D0057417B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B87824E01C1891D900F12E02 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 0F0FFBAFF4293D5A7F4C81464719D20A;
-			remoteInfo = "Pods-libKaa.a";
+			remoteGlobalIDString = 0B2AEF7928285B60CFB19219147BC376;
+			remoteInfo = "Pods-Kaa";
 		};
-		B87824F61C18921A00F12E02 /* PBXContainerItemProxy */ = {
+		C569245F1CC13E0D0057417B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = B87824D71C1891D100F12E02 /* Kaa.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B824A1EA1B1452C50076C753;
-			remoteInfo = libKaa.a;
+			containerPortal = B87824E01C1891D900F12E02 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A055D00B899A2917E39015C988A19A2C;
+			remoteInfo = sqlite3;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		C56924621CC13E170057417B /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				C56924631CC13E1D0057417B /* Kaa.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		B87824D71C1891D100F12E02 /* Kaa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Kaa.xcodeproj; path = "libs/kaa-ep-sdk/Kaa.xcodeproj"; sourceTree = "<group>"; };
 		B87824E01C1891D900F12E02 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = "libs/kaa-ep-sdk/Pods/Pods.xcodeproj"; sourceTree = "<group>"; };
@@ -102,7 +116,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B87824F51C18921600F12E02 /* libKaa.a in Frameworks */,
+				C56924611CC13E150057417B /* Kaa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,7 +126,7 @@
 		B87824D81C1891D100F12E02 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B87824DD1C1891D100F12E02 /* libKaa.a */,
+				C56924551CC13E0D0057417B /* Kaa.framework */,
 				B87824DF1C1891D100F12E02 /* KaaTests.xctest */,
 			);
 			name = Products;
@@ -125,8 +139,9 @@
 				B87824EC1C1891D900F12E02 /* libCocoaLumberjack.a */,
 				B87824EE1C1891D900F12E02 /* libOCHamcrest.a */,
 				B87824F01C1891D900F12E02 /* libOCMockito.a */,
+				C569245E1CC13E0D0057417B /* libPods-Kaa.a */,
 				B87824F21C1891D900F12E02 /* libPods-KaaTests.a */,
-				B87824F41C1891D900F12E02 /* libPods-libKaa.a.a */,
+				C56924601CC13E0D0057417B /* libsqlite3.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -175,11 +190,11 @@
 				B8B9974C1BE3FB9600C0ABCE /* Sources */,
 				B8B9974D1BE3FB9600C0ABCE /* Frameworks */,
 				B8B9974E1BE3FB9600C0ABCE /* Resources */,
+				C56924621CC13E170057417B /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B87824F71C18921A00F12E02 /* PBXTargetDependency */,
 			);
 			name = NotificationDemo;
 			productName = EventDemo;
@@ -197,7 +212,6 @@
 				TargetAttributes = {
 					B8B9974F1BE3FB9600C0ABCE = {
 						CreatedOnToolsVersion = 7.0.1;
-						DevelopmentTeam = G8JGASHVD4;
 					};
 				};
 			};
@@ -230,13 +244,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B87824DD1C1891D100F12E02 /* libKaa.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libKaa.a;
-			remoteRef = B87824DC1C1891D100F12E02 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		B87824DF1C1891D100F12E02 /* KaaTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -279,11 +286,25 @@
 			remoteRef = B87824F11C1891D900F12E02 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B87824F41C1891D900F12E02 /* libPods-libKaa.a.a */ = {
+		C56924551CC13E0D0057417B /* Kaa.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Kaa.framework;
+			remoteRef = C56924541CC13E0D0057417B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C569245E1CC13E0D0057417B /* libPods-Kaa.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libPods-libKaa.a.a";
-			remoteRef = B87824F31C1891D900F12E02 /* PBXContainerItemProxy */;
+			path = "libPods-Kaa.a";
+			remoteRef = C569245D1CC13E0D0057417B /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		C56924601CC13E0D0057417B /* libsqlite3.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsqlite3.a;
+			remoteRef = C569245F1CC13E0D0057417B /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -314,14 +335,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B87824F71C18921A00F12E02 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = libKaa.a;
-			targetProxy = B87824F61C18921A00F12E02 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		E8290ACB1C08845700AA184A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -346,6 +359,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -389,6 +403,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -427,12 +442,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/NotificationDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = NotificationDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Debug;
 		};
@@ -441,12 +456,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 				INFOPLIST_FILE = "$(SRCROOT)/NotificationDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.kaaproject.EventDemo;
 				PRODUCT_NAME = NotificationDemo;
-				USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
 			};
 			name = Release;
 		};
diff --git a/notificationdemo/source/objc/NotificationDemo/AppDelegate.h b/notificationdemo/source/objc/NotificationDemo/AppDelegate.h
index b8eec0fc1..4edeb741d 100644
--- a/notificationdemo/source/objc/NotificationDemo/AppDelegate.h
+++ b/notificationdemo/source/objc/NotificationDemo/AppDelegate.h
@@ -20,6 +20,5 @@
 
 @property (strong, nonatomic) UIWindow *window;
 
-
 @end
 
diff --git a/notificationdemo/source/objc/NotificationDemo/ViewController.h b/notificationdemo/source/objc/NotificationDemo/ViewController.h
index ef465bc14..8f4ee9c37 100644
--- a/notificationdemo/source/objc/NotificationDemo/ViewController.h
+++ b/notificationdemo/source/objc/NotificationDemo/ViewController.h
@@ -18,6 +18,5 @@
 
 @interface ViewController : UIViewController
 
-
 @end
 
diff --git a/notificationdemo/source/objc/NotificationDemo/ViewController.m b/notificationdemo/source/objc/NotificationDemo/ViewController.m
index 7849b0e14..023e935b4 100644
--- a/notificationdemo/source/objc/NotificationDemo/ViewController.m
+++ b/notificationdemo/source/objc/NotificationDemo/ViewController.m
@@ -15,7 +15,8 @@
  */
 
 #import "ViewController.h"
-#import <Kaa/Kaa.h>
+
+@import Kaa;
 
 @interface ViewController () <KaaClientStateDelegate, NotificationTopicListDelegate, NotificationDelegate, ProfileContainer>
 
@@ -34,7 +35,7 @@ - (void)viewDidLoad {
     [self addLogWithText:@"NotificationDemo started"];
     
     //Create a Kaa client with the Kaa default context.
-    self.kaaClient = [Kaa clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
+    self.kaaClient = [KaaClientFactory clientWithContext:[[DefaultKaaPlatformContext alloc] init] stateDelegate:self];
     
     // A listener that listens to the notification topic list updates.
     [self.kaaClient addTopicListDelegate:self];

From b375290c8d2a24225fe520a208bffb44e6beb8d0 Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Mon, 18 Apr 2016 15:46:24 +0300
Subject: [PATCH 26/42] KAA-947 Fix license headers and exclude files

---
 .../source/c/targets/cc32xx/app.ld            | 30 +++++++++----------
 .../source/c/targets/x86-64/CMakeLists.txt    | 16 ++++++++++
 pom.xml                                       |  3 +-
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/configurationdemo/source/c/targets/cc32xx/app.ld b/configurationdemo/source/c/targets/cc32xx/app.ld
index 9417208c2..3c67311e0 100644
--- a/configurationdemo/source/c/targets/cc32xx/app.ld
+++ b/configurationdemo/source/c/targets/cc32xx/app.ld
@@ -3,35 +3,35 @@
 *
 * GCC Linker script for blinky application.
 *
-* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
-* 
-* 
-*  Redistribution and use in source and binary forms, with or without 
-*  modification, are permitted provided that the following conditions 
+* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+*
+*
+*  Redistribution and use in source and binary forms, with or without
+*  modification, are permitted provided that the following conditions
 *  are met:
 *
-*    Redistributions of source code must retain the above copyright 
+*    Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 *    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the 
-*    documentation and/or other materials provided with the   
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the
 *    distribution.
 *
 *    Neither the name of Texas Instruments Incorporated nor the names of
 *    its contributors may be used to endorse or promote products derived
 *    from this software without specific prior written permission.
 *
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 ******************************************************************************/
diff --git a/configurationdemo/source/c/targets/x86-64/CMakeLists.txt b/configurationdemo/source/c/targets/x86-64/CMakeLists.txt
index 06a2d2145..a6e0b27fa 100644
--- a/configurationdemo/source/c/targets/x86-64/CMakeLists.txt
+++ b/configurationdemo/source/c/targets/x86-64/CMakeLists.txt
@@ -1,3 +1,19 @@
+#
+#  Copyright 2014-2016 CyberVision, Inc.
+#
+#  Licensed 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.
+#
+
 # Target support library that provides abstractions for x86-64 target.
 add_library(target_support INTERFACE)
 target_include_directories(target_support INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/pom.xml b/pom.xml
index 6c4b4d34c..012304c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
                     <artifactId>maven-source-plugin</artifactId>
                     <version>2.2.1</version>
                 </plugin>
-                <!--This plugin's configuration is used to store Eclipse 
+                <!--This plugin's configuration is used to store Eclipse
                     m2e settings only. It has no influence on the Maven build itself. -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -275,6 +275,7 @@
                         <exclude>**/source/esp8266/include/driver/uart*.h</exclude>
                         <exclude>**/source/cc32xx/platform/cc32xx/app.ld</exclude>
                         <exclude>**/source/cc32xx/cc32xx/app.ld</exclude>
+                        <exclude>**/targets/cc32xx/app.ld</exclude>
                         <exclude>**/source/cc32xx/libs/kaa/PUT_SDK_HERE</exclude>
                         <exclude>**/source/esp8266/libs/kaa/PUT_SDK_HERE</exclude>
                         <exclude>**/VoltageReport.java</exclude>

From cdd50d51ddfcc4fba3d0e700747ee4636889a632 Mon Sep 17 00:00:00 2001
From: Peter Krutsiuk <pkrutsiuk@cybervisiontech.com>
Date: Mon, 18 Apr 2016 18:43:31 +0300
Subject: [PATCH 27/42] APP-70: Update c++ sample

---
 datacollectiondemo/source/cpp/src/KaaDemo.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/datacollectiondemo/source/cpp/src/KaaDemo.cpp b/datacollectiondemo/source/cpp/src/KaaDemo.cpp
index 644783c23..e0e18dc55 100644
--- a/datacollectiondemo/source/cpp/src/KaaDemo.cpp
+++ b/datacollectiondemo/source/cpp/src/KaaDemo.cpp
@@ -64,12 +64,12 @@ int main()
         std::cout << "Sent " << logNumber << "th record" << std::endl;
     }
 
-    for (auto it = futurePairs.begin(); it != futurePairs.end(); ++it) {
+    for (auto& pair : futurePairs) {
         try {
-            RecordInfo recordInfo = it->first.get();
+            RecordInfo recordInfo = pair.first.get();
             BucketInfo bucketInfo = recordInfo.getBucketInfo();
 
-            std::size_t timeSpent = (recordInfo.getRecordAddedTimestampMs() - it->second)
+            std::size_t timeSpent = (recordInfo.getRecordAddedTimestampMs() - pair.second)
                                         + recordInfo.getRecordDeliveryTimeMs();
 
             std::cout << "Received log record delivery info. Bucket Id [" <<  bucketInfo.getBucketId() << "]. "

From a4bc4cb83f3e6d3e1665c86367400bf4766ce046 Mon Sep 17 00:00:00 2001
From: Sasha Didukh <sasha.didukh@gmail.com>
Date: Wed, 20 Apr 2016 14:11:12 +0300
Subject: [PATCH 28/42] APP-75: Update sample applications to use AdminClient
 methods based on application token instead of application ids.

---
 .../demo/activation/utils/AdminClientManager.java    | 12 ++++++------
 .../examples/activation/ActivationDemoBuilder.java   |  5 +++--
 .../kaa/examples/cityguide/CityGuideDemoBuilder.java |  5 +++--
 .../citylights/client/KaaRestController.java         | 12 ++++++------
 .../controller/CityLightsControllerDemoBuilder.java  |  2 +-
 .../configuration/ConfigurationDemoBuilder.java      |  2 +-
 .../connectedcar/ConnectedCarDemoBuilder.java        |  2 +-
 .../streetlight/StreetLightDriverDemoBuilder.java    |  3 ++-
 .../notification/NotificationDemoBuilder.java        |  2 +-
 .../powerplant/PowerPlantAndroidDemoBuilder.java     |  2 +-
 .../examples/powerplant/PowerPlantDemoBuilder.java   |  2 +-
 .../twitterboard/TwitterBoardDemoBuilder.java        |  2 +-
 .../kaa/demo/twitterled/monitor/TwitterMonitor.java  |  4 ++--
 .../twittermonitor/TwitterMonitorDemoBuilder.java    |  4 ++--
 .../vehicletelemetry/VehicleTelemetryDemoBuider.java |  3 ++-
 .../kaa/examples/verifiers/VerifiersDemoBuilder.java |  2 +-
 16 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
index f7a061a30..7f02afbef 100644
--- a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
+++ b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
@@ -127,18 +127,18 @@ public ApplicationDto getApplicationByName(String applicationName) {
     }
 
     /**
-     * Get all endpoint groups associated with given application Id
+     * Get all endpoint groups associated with given application Token
      * 
-     * @param applicationId
-     *            the application Id
+     * @param applicationToken
+     *            the application Token
      * @return list of endpoint groups
      */
-    public List<EndpointGroupDto> getEndpointGroups(String applicationId) {
+    public List<EndpointGroupDto> getEndpointGroups(String applicationToken) {
         checkAuthorizationAndLogin();
 
         List<EndpointGroupDto> endpointGroups = null;
         try {
-            endpointGroups = adminClient.getEndpointGroups(applicationId);
+            endpointGroups = adminClient.getEndpointGroupsByAppToken(applicationToken);
         } catch (Exception e) {
             LOG.error("Exception has occurred: " + e.getMessage());
         }
@@ -179,7 +179,7 @@ public List<EndpointGroupDto> getEndpointGroupsByApplicationName(String applicat
             return null;
         }
 
-        return getEndpointGroups(applicationDto.getId());
+        return getEndpointGroups(applicationDto.getApplicationToken());
     }
 
     /**
diff --git a/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java b/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
index c82b4a10a..e735e1183 100644
--- a/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
+++ b/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
@@ -69,7 +69,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         sdkProfileDto.setConfigurationSchemaVersion(configurationSchema.getVersion());
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(activationApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(activationApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
@@ -77,7 +77,8 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
             throw new RuntimeException("Can't get default endpoint group for activation application!");
         }
 
-        CTLSchemaDto serverProfileCtlSchema = client.saveCTLSchema(getResourceAsString("server_profile_schema.avsc"), activationApplication.getTenantId(), activationApplication.getId());
+        CTLSchemaDto serverProfileCtlSchema = client.saveCTLSchemaWithAppToken(getResourceAsString("server_profile_schema.avsc"),
+                activationApplication.getTenantId(), activationApplication.getApplicationToken());
 
         ServerProfileSchemaDto serverProfileSchema = new ServerProfileSchemaDto();
         serverProfileSchema.setApplicationId(activationApplication.getId());
diff --git a/cityguide/src/main/java/org/kaaproject/kaa/examples/cityguide/CityGuideDemoBuilder.java b/cityguide/src/main/java/org/kaaproject/kaa/examples/cityguide/CityGuideDemoBuilder.java
index a1088075c..83651ece3 100644
--- a/cityguide/src/main/java/org/kaaproject/kaa/examples/cityguide/CityGuideDemoBuilder.java
+++ b/cityguide/src/main/java/org/kaaproject/kaa/examples/cityguide/CityGuideDemoBuilder.java
@@ -68,7 +68,8 @@ protected void buildDemoApplicationImpl(AdminClient client)
         configurationSchema = client.createConfigurationSchema(configurationSchema, getResourcePath("city_guide.avsc"));
         sdkProfileDto.setConfigurationSchemaVersion(configurationSchema.getVersion());
         
-        CTLSchemaDto profileCtlSchema = client.saveCTLSchema(getResourceAsString("city_guide_profile.avsc"), cityGuideApplication.getTenantId(), cityGuideApplication.getId());
+        CTLSchemaDto profileCtlSchema = client.saveCTLSchemaWithAppToken(getResourceAsString("city_guide_profile.avsc"), cityGuideApplication.getTenantId(),
+                cityGuideApplication.getApplicationToken());
         
         EndpointProfileSchemaDto profileSchema = new EndpointProfileSchemaDto();
         profileSchema.setApplicationId(cityGuideApplication.getId());
@@ -80,7 +81,7 @@ protected void buildDemoApplicationImpl(AdminClient client)
         sdkProfileDto.setProfileSchemaVersion(profileSchema.getVersion());
         
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(cityGuideApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(cityGuideApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/citylights-controller/source/java/src/org/kaaproject/kaa/demo/iotworld/citylights/client/KaaRestController.java b/citylights-controller/source/java/src/org/kaaproject/kaa/demo/iotworld/citylights/client/KaaRestController.java
index 8c946bc4b..67d2f52c0 100644
--- a/citylights-controller/source/java/src/org/kaaproject/kaa/demo/iotworld/citylights/client/KaaRestController.java
+++ b/citylights-controller/source/java/src/org/kaaproject/kaa/demo/iotworld/citylights/client/KaaRestController.java
@@ -37,7 +37,7 @@ public void updateTrafficLights(boolean allow) throws Exception {
         AdminClient client = new AdminClient(configuration.getHost(), configuration.getPort());
         client.login(configuration.getLogin(), configuration.getPassword());
         ApplicationDto application = getApplication(client, configuration.getTrafficLightsAppToken());
-        EndpointGroupDto groupAll = getGroupAll(client, application.getId());
+        EndpointGroupDto groupAll = getGroupAll(client, application.getApplicationToken());
         ConfigurationRecordDto currentConfiguration = getConfiguration(client, groupAll.getId(),
                 configuration.getTrafficLightsCfSchemaVersion());
         ConfigurationDto activeConfiguration = currentConfiguration.getActiveConfiguration();
@@ -56,7 +56,7 @@ public void updateStreetLights(int zoneId, boolean on) throws Exception {
         AdminClient client = new AdminClient(configuration.getHost(), configuration.getPort());
         client.login(configuration.getLogin(), configuration.getPassword());
         ApplicationDto application = getApplication(client, configuration.getStreetLightsAppToken());
-        EndpointGroupDto group = getGroupByName(client, application.getId(), "Zone " + zoneId);
+        EndpointGroupDto group = getGroupByName(client, application.getApplicationToken(), "Zone " + zoneId);
         ConfigurationRecordDto currentConfiguration = getConfiguration(client, group.getId(),
                 configuration.getStreetLightsCfSchemaVersion());
         ConfigurationDto activeConfiguration = currentConfiguration.getActiveConfiguration();
@@ -91,8 +91,8 @@ private ApplicationDto getApplication(AdminClient client, String trafficLightsAp
         throw new IllegalStateException("Application with token " + trafficLightsAppToken + " not found!");
     }
 
-    private EndpointGroupDto getGroupAll(AdminClient client, String applicationId) throws Exception {
-        List<EndpointGroupDto> groups = client.getEndpointGroups(applicationId);
+    private EndpointGroupDto getGroupAll(AdminClient client, String applicationToken) throws Exception {
+        List<EndpointGroupDto> groups = client.getEndpointGroupsByAppToken(applicationToken);
         for (EndpointGroupDto dto : groups) {
             if (dto.getWeight() == 0) {
                 return dto;
@@ -101,8 +101,8 @@ private EndpointGroupDto getGroupAll(AdminClient client, String applicationId) t
         throw new IllegalStateException("Endpoint group with weight 0 not found!");
     }
 
-    private EndpointGroupDto getGroupByName(AdminClient client, String applicationId, String name) throws Exception {
-        List<EndpointGroupDto> groups = client.getEndpointGroups(applicationId);
+    private EndpointGroupDto getGroupByName(AdminClient client, String applicationToken, String name) throws Exception {
+        List<EndpointGroupDto> groups = client.getEndpointGroupsByAppToken(applicationToken);
         for (EndpointGroupDto dto : groups) {
             if (dto.getName().equals(name)) {
                 return dto;
diff --git a/citylights-controller/src/main/java/org/kaaproject/kaa/examples/citylights/controller/CityLightsControllerDemoBuilder.java b/citylights-controller/src/main/java/org/kaaproject/kaa/examples/citylights/controller/CityLightsControllerDemoBuilder.java
index 249a43c6d..476ab20f4 100644
--- a/citylights-controller/src/main/java/org/kaaproject/kaa/examples/citylights/controller/CityLightsControllerDemoBuilder.java
+++ b/citylights-controller/src/main/java/org/kaaproject/kaa/examples/citylights/controller/CityLightsControllerDemoBuilder.java
@@ -79,7 +79,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         logger.info("Configuration schema was created.");
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(cityLightsDemoApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(cityLightsDemoApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/configurationdemo/src/main/java/org/kaaproject/kaa/examples/configuration/ConfigurationDemoBuilder.java b/configurationdemo/src/main/java/org/kaaproject/kaa/examples/configuration/ConfigurationDemoBuilder.java
index 081841766..6e44037d0 100644
--- a/configurationdemo/src/main/java/org/kaaproject/kaa/examples/configuration/ConfigurationDemoBuilder.java
+++ b/configurationdemo/src/main/java/org/kaaproject/kaa/examples/configuration/ConfigurationDemoBuilder.java
@@ -69,7 +69,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         logger.info("Configuration schema was created.");
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(configurationApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(configurationApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/connectedcar/src/main/java/org/kaaproject/kaa/examples/connectedcar/ConnectedCarDemoBuilder.java b/connectedcar/src/main/java/org/kaaproject/kaa/examples/connectedcar/ConnectedCarDemoBuilder.java
index da3a4e5d5..73428e04c 100644
--- a/connectedcar/src/main/java/org/kaaproject/kaa/examples/connectedcar/ConnectedCarDemoBuilder.java
+++ b/connectedcar/src/main/java/org/kaaproject/kaa/examples/connectedcar/ConnectedCarDemoBuilder.java
@@ -136,7 +136,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         sdkProfileDto.setConfigurationSchemaVersion(configurationSchema.getVersion());
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(connectedCarApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(connectedCarApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/econais/ec19d/streetlight-driver/src/main/java/org/kaaproject/kaa/examples/streetlight/StreetLightDriverDemoBuilder.java b/econais/ec19d/streetlight-driver/src/main/java/org/kaaproject/kaa/examples/streetlight/StreetLightDriverDemoBuilder.java
index 39bf6eca7..b4a0a3098 100644
--- a/econais/ec19d/streetlight-driver/src/main/java/org/kaaproject/kaa/examples/streetlight/StreetLightDriverDemoBuilder.java
+++ b/econais/ec19d/streetlight-driver/src/main/java/org/kaaproject/kaa/examples/streetlight/StreetLightDriverDemoBuilder.java
@@ -62,7 +62,8 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
 
         logger.info("Creating profile schema...");
         
-        CTLSchemaDto profileCtlSchema = client.saveCTLSchema(getResourceAsString("profile.avsc"), streetLightApplication.getTenantId(), streetLightApplication.getId());
+        CTLSchemaDto profileCtlSchema = client.saveCTLSchemaWithAppToken(getResourceAsString("profile.avsc"), streetLightApplication.getTenantId(),
+                streetLightApplication.getApplicationToken());
         
         EndpointProfileSchemaDto profileSchemaDto = new EndpointProfileSchemaDto();
         profileSchemaDto.setApplicationId(streetLightApplication.getId());
diff --git a/notificationdemo/src/main/java/org/kaaproject/kaa/examples/notification/NotificationDemoBuilder.java b/notificationdemo/src/main/java/org/kaaproject/kaa/examples/notification/NotificationDemoBuilder.java
index 3167562b9..a56857949 100644
--- a/notificationdemo/src/main/java/org/kaaproject/kaa/examples/notification/NotificationDemoBuilder.java
+++ b/notificationdemo/src/main/java/org/kaaproject/kaa/examples/notification/NotificationDemoBuilder.java
@@ -108,7 +108,7 @@ private SdkProfileDto createNotificationApplication(AdminClient client,
 
         logger.info("Getting base endpoint group");
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(notificationApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(notificationApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/powerplant-android/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantAndroidDemoBuilder.java b/powerplant-android/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantAndroidDemoBuilder.java
index 6f5919e27..5b7268223 100644
--- a/powerplant-android/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantAndroidDemoBuilder.java
+++ b/powerplant-android/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantAndroidDemoBuilder.java
@@ -67,7 +67,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         logger.info("Configuration schema was created.");
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(powerPlantAndroidApplciation.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(powerPlantAndroidApplciation.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/powerplant/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantDemoBuilder.java b/powerplant/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantDemoBuilder.java
index 30fc3c162..966f2213b 100644
--- a/powerplant/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantDemoBuilder.java
+++ b/powerplant/src/main/java/org/kaaproject/kaa/examples/powerplant/PowerPlantDemoBuilder.java
@@ -108,7 +108,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         logger.info("Configuration schema was created.");
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(powerPlantApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(powerPlantApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/twitterled/twitterboard/src/main/java/org/kaaproject/kaa/examples/twitterboard/TwitterBoardDemoBuilder.java b/twitterled/twitterboard/src/main/java/org/kaaproject/kaa/examples/twitterboard/TwitterBoardDemoBuilder.java
index d22eccefb..bb6fbfb55 100644
--- a/twitterled/twitterboard/src/main/java/org/kaaproject/kaa/examples/twitterboard/TwitterBoardDemoBuilder.java
+++ b/twitterled/twitterboard/src/main/java/org/kaaproject/kaa/examples/twitterboard/TwitterBoardDemoBuilder.java
@@ -83,7 +83,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         logger.info("Notification schema was created.");
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(twitterBoardApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(twitterBoardApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
diff --git a/twitterled/twittermonitor/source/java/src/org/kaaproject/kaa/demo/twitterled/monitor/TwitterMonitor.java b/twitterled/twittermonitor/source/java/src/org/kaaproject/kaa/demo/twitterled/monitor/TwitterMonitor.java
index 8f48d7222..a01240b14 100644
--- a/twitterled/twittermonitor/source/java/src/org/kaaproject/kaa/demo/twitterled/monitor/TwitterMonitor.java
+++ b/twitterled/twittermonitor/source/java/src/org/kaaproject/kaa/demo/twitterled/monitor/TwitterMonitor.java
@@ -195,7 +195,7 @@ private static ApplicationDto filterApplications(AdminClient adminClient, KaaCli
     private static NotificationSchemaDto fetchNotificationSchema(AdminClient adminClient, ApplicationDto appDto,
             KaaClientConfiguration kaaClientConfiguration) throws Exception {
         int schemaVersion = kaaClientConfiguration.getNfSchemaVersion();
-        for (NotificationSchemaDto schemaDto : adminClient.getNotificationSchemas(appDto.getId())) {
+        for (NotificationSchemaDto schemaDto : adminClient.getNotificationSchemasByAppToken(appDto.getApplicationToken())) {
             if (schemaDto.getMajorVersion() == schemaVersion) {
                 return schemaDto;
             }
@@ -206,7 +206,7 @@ private static NotificationSchemaDto fetchNotificationSchema(AdminClient adminCl
     private static TopicDto fetchNotificationTopic(AdminClient adminClient, ApplicationDto appDto,
             KaaClientConfiguration kaaClientConfiguration) throws Exception {
         String topicName = kaaClientConfiguration.getTopicName();
-        for (TopicDto topicDto : adminClient.getTopics(appDto.getId())) {
+        for (TopicDto topicDto : adminClient.getTopicsByApplicationToken(appDto.getApplicationToken())) {
             if (topicDto.getName().equalsIgnoreCase(topicName)) {
                 return topicDto;
             }
diff --git a/twitterled/twittermonitor/src/main/java/org/kaaproject/kaa/examples/twittermonitor/TwitterMonitorDemoBuilder.java b/twitterled/twittermonitor/src/main/java/org/kaaproject/kaa/examples/twittermonitor/TwitterMonitorDemoBuilder.java
index e611925c8..7691d5f87 100644
--- a/twitterled/twittermonitor/src/main/java/org/kaaproject/kaa/examples/twittermonitor/TwitterMonitorDemoBuilder.java
+++ b/twitterled/twittermonitor/src/main/java/org/kaaproject/kaa/examples/twittermonitor/TwitterMonitorDemoBuilder.java
@@ -72,7 +72,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         logger.info("Configuration schema was created.");
 
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(twitterMonitorApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(twitterMonitorApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }
@@ -104,7 +104,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         String twitterBoardAppToken = twitterBoardApplication.getApplicationToken();
         logger.info("Twitter board app token was gotten: [{}]", twitterBoardAppToken);
         logger.info("Getting twitter board notification...");
-        List<NotificationSchemaDto> notificationSchemas = client.getNotificationSchemas(twitterBoardApplication.getId());
+        List<NotificationSchemaDto> notificationSchemas = client.getNotificationSchemasByAppToken(twitterBoardApplication.getApplicationToken());
         logger.info("All available notification schemas for twitter board application: [{}]", notificationSchemas);
         NotificationSchemaDto twitterBoardNotificationSchema = getTwitterBoardNotificationSchema(notificationSchemas);
         Integer twitterBoardNfSchemaVersion = twitterBoardNotificationSchema.getVersion();
diff --git a/vehicletelemetry/src/main/java/org/kaaproject/kaa/examples/vehicletelemetry/VehicleTelemetryDemoBuider.java b/vehicletelemetry/src/main/java/org/kaaproject/kaa/examples/vehicletelemetry/VehicleTelemetryDemoBuider.java
index 87e8888a0..d36304244 100644
--- a/vehicletelemetry/src/main/java/org/kaaproject/kaa/examples/vehicletelemetry/VehicleTelemetryDemoBuider.java
+++ b/vehicletelemetry/src/main/java/org/kaaproject/kaa/examples/vehicletelemetry/VehicleTelemetryDemoBuider.java
@@ -59,7 +59,8 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
 
         loginTenantDeveloper(client);
 
-        CTLSchemaDto profileCtlSchema = client.saveCTLSchema(getResourceAsString("profileSchema.json"), vehicleTelemetryApplication.getTenantId(), vehicleTelemetryApplication.getId());
+        CTLSchemaDto profileCtlSchema = client.saveCTLSchemaWithAppToken(getResourceAsString("profileSchema.json"), vehicleTelemetryApplication.getTenantId(),
+                vehicleTelemetryApplication.getApplicationToken());
 
         EndpointProfileSchemaDto profileSchema = new EndpointProfileSchemaDto();
         profileSchema.setApplicationId(vehicleTelemetryApplication.getId());
diff --git a/verifiersdemo/src/main/java/org/kaaproject/kaa/examples/verifiers/VerifiersDemoBuilder.java b/verifiersdemo/src/main/java/org/kaaproject/kaa/examples/verifiers/VerifiersDemoBuilder.java
index e1696b472..2d9058867 100644
--- a/verifiersdemo/src/main/java/org/kaaproject/kaa/examples/verifiers/VerifiersDemoBuilder.java
+++ b/verifiersdemo/src/main/java/org/kaaproject/kaa/examples/verifiers/VerifiersDemoBuilder.java
@@ -144,7 +144,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
 
         logger.info("Getting endpoint group...");
         EndpointGroupDto baseEndpointGroup = null;
-        List<EndpointGroupDto> endpointGroups = client.getEndpointGroups(verifiersApplication.getId());
+        List<EndpointGroupDto> endpointGroups = client.getEndpointGroupsByAppToken(verifiersApplication.getApplicationToken());
         if (endpointGroups.size() == 1 && endpointGroups.get(0).getWeight() == 0) {
             baseEndpointGroup = endpointGroups.get(0);
         }

From d2a63beef4c2676b1c0ec77916714989bd35a7bb Mon Sep 17 00:00:00 2001
From: Sasha Didukh <sasha.didukh@gmail.com>
Date: Mon, 25 Apr 2016 14:12:59 +0300
Subject: [PATCH 29/42] APP-76: Replace documentation links from
 https://docs.kaaproject.org to http://docs.kaaproject.org

---
 configurationdemo/resources/config_data.json           | 4 ++--
 notificationdemo/resources/mandatory_notification.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configurationdemo/resources/config_data.json b/configurationdemo/resources/config_data.json
index f4349ecb2..4546545d3 100644
--- a/configurationdemo/resources/config_data.json
+++ b/configurationdemo/resources/config_data.json
@@ -13,12 +13,12 @@
       },
       {
         "label":"Kaa docs",
-        "url":"https://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home",
+        "url":"http://docs.kaaproject.org/display/KAA/Kaa+IoT+Platform+Home",
         "__uuid":null
       },
       {
         "label":"Kaa configuration design reference",
-        "url":"https://docs.kaaproject.org/display/KAA/Configuration",
+        "url":"http://docs.kaaproject.org/display/KAA/Configuration",
         "__uuid":null
       }
     ]
diff --git a/notificationdemo/resources/mandatory_notification.json b/notificationdemo/resources/mandatory_notification.json
index dd166be8b..a998a4f95 100644
--- a/notificationdemo/resources/mandatory_notification.json
+++ b/notificationdemo/resources/mandatory_notification.json
@@ -1,5 +1,5 @@
 {
   "message":{
-    "string":"This is sample notification for mandatory topic. Client automatically receive notifications for manadatory topics. More details here: https://docs.kaaproject.org/display/KAA/Using+notifications"
+    "string":"This is sample notification for mandatory topic. Client automatically receive notifications for manadatory topics. More details here: http://docs.kaaproject.org/display/KAA/Using+notifications"
   }
 }

From 23c07a02f2312152e15a1def9e080467f41ae66b Mon Sep 17 00:00:00 2001
From: Anton Bohomol <anton.bogomol@gmail.com>
Date: Mon, 25 Apr 2016 18:44:54 +0300
Subject: [PATCH 30/42] APP-62-hotfix

---
 .../src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java b/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
index d5929c06d..8b5942913 100644
--- a/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
+++ b/verifiersdemo/source/src/org/kaaproject/kaa/demo/verifiersdemo/LoginActivity.java
@@ -30,6 +30,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.ImageButton;
 
 import com.facebook.Session;
 import com.facebook.UiLifecycleHelper;

From c992e0fce507fea673b4c7775043b29e42cb7f5f Mon Sep 17 00:00:00 2001
From: dsergeev <deepnekro@gmail.com>
Date: Tue, 26 Apr 2016 15:28:42 +0300
Subject: [PATCH 31/42] APP-64: Refactor Activation Demo application to
 demonstrate Device management feature

---
 activationdemo/resources/projects.xml         |  32 +++++-
 .../kaa/demo/activation/ActivationDemo.java   | 105 +++++++++++++-----
 .../activation/utils/AdminClientManager.java  |  61 +++++++++-
 .../activation/ActivationDemoBuilder.java     |   1 +
 4 files changed, 163 insertions(+), 36 deletions(-)

diff --git a/activationdemo/resources/projects.xml b/activationdemo/resources/projects.xml
index 6e7af9eb8..c99f88b06 100644
--- a/activationdemo/resources/projects.xml
+++ b/activationdemo/resources/projects.xml
@@ -26,23 +26,43 @@
         <description>Endpoint activation application that demonstrates Kaa’s server profiling, grouping, and configuration management capabilities</description>
         <details>
             <![CDATA[
-This Endpoint activation app demonstrates the use of server-side endpoint profile feature. It allows to activate/deactivate device based on the endpoint ID using Kaa REST API.
+This Endpoint activation app demonstrates the use of server-side endpoint profile and device management features. It allows to activate/deactivate device based on the endpoint ID and work with endpoint credentials using Kaa REST API.
 
 <h2>Installation</h2>
-Download the jar file to your desktop by clicking the "Binary" button on the left. Make sure that you have Java runtime installed. Application can run in two modes: client and admin. The mode is specified by command line arguments.<br/>
+Download the jar file to your desktop by clicking the "Binary" button on the left. Make sure that you have Java runtime installed. Application can run in three modes: client, admin and developer. The mode is specified by command line arguments.<br/>
 To run in the "admin" mode, use the following command in the console:
 <pre>
-$ java -jar ActivationDemo.jar admin ipAddress
+$ java -jar ActivationDemo.jar admin [ipAddress] [port]
+Example:
+$ java -jar ActivationDemo.jar admin localhost 8080
 </pre>
 Where ipAddress is the address of the Kaa node, where the administrative REST API is deployed.<br/><br/>
 To run in the "client" mode, use the following command in the console:
 <pre>
 $ java -jar ActivationDemo.jar client
 </pre>
+To run in the "developer" mode, use the following command in the console:
+<pre>
+$ java -jar ActivationDemo.jar developer [ipAddress] [port]
+</pre>
 <h2>Playing around</h2>
-Make sure that the Kaa Sandbox is up and running. When using the "Activation Demo" app in "admin" mode you will be able
-to activate/deactivate any endoint associated with Activation app. Endpoint activation and deactivation are performed by updating server profile using REST API.<br/><br/>
-"Activation Demo" app in "client" mode creates and registers one Kaa endpoint (per application instance). In this mode app displays the current state of the endpoint (active or inactive). Once the activation/deactivation is performed via the "admin" application, your endpoint will be served with the new configuration data according to the server-side endpoint profile change.<br/><br/>
+Make sure that the Kaa Sandbox is up and running.
+"Activation Demo" consists of the next modes:
+
+1) In "admin" mode you will be able to do credentials provisioning (Device Management feature), revocation and registration. Before using "developer" or "client" mode, you need to create and register endpoint credentials via Kaa REST API.
+Run app with the next command:
+<pre>
+$ java -jar ActivationDemo.jar admin [kaa_hostname] 8080
+</pre>
+Then choose the first menu item by typing "1" and pressing "Enter".
+Exit from application by typing "3" and pressing "Enter".
+Now credentials was created and registered in Kaa. Corresponding "key.private" and "key.public" files are created.
+Starting from now, you can use other modes.
+2) In "developer" mode you will be able
+to activate/deactivate any endpoint associated with Activation app. Endpoint activation and deactivation are performed by updating server profile using REST API.<br/><br/>
+"Activation Demo" app in "client" mode creates and registers one Kaa endpoint (per application instance). In this mode app displays the current state of the endpoint (active or inactive). Once the activation/deactivation is performed via the "developer" application, your endpoint will be served with the new configuration data according to the server-side endpoint profile change.<br/>
+
+<br/>
 
 To understand better how this app works, you should navigate to the Kaa server administrative interface by clicking the "Administrative console" link at the top of your Sandbox window. Log in as a tenant developer (devuser / devuser123 by default), and go to the "Activation demo" application. Select "Schemas"->"Server-side EP profile". The app uses one schema version, which contains one value: "active" (boolean). The Kaa server uses this value to filter endpoints by their profile contents. Server-side endpoint profiles can be updated either via Admin Console, or via the REST API (which is done by the "Activation app" in the "admin" mode)<br/><br/>
 
diff --git a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/ActivationDemo.java b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/ActivationDemo.java
index e41ab470c..3b33120b7 100644
--- a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/ActivationDemo.java
+++ b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/ActivationDemo.java
@@ -16,21 +16,20 @@
 
 package org.kaaproject.kaa.demo.activation;
 
-import org.kaaproject.kaa.client.DesktopKaaPlatformContext;
-import org.kaaproject.kaa.client.Kaa;
-import org.kaaproject.kaa.client.KaaClient;
-import org.kaaproject.kaa.client.SimpleKaaClientStateListener;
+import org.kaaproject.kaa.client.*;
 import org.kaaproject.kaa.client.channel.IPTransportInfo;
 import org.kaaproject.kaa.client.configuration.base.ConfigurationListener;
 import org.kaaproject.kaa.client.configuration.base.SimpleConfigurationStorage;
+import org.kaaproject.kaa.client.profile.ProfileContainer;
 import org.kaaproject.kaa.common.TransportType;
 import org.kaaproject.kaa.common.dto.EndpointGroupDto;
 import org.kaaproject.kaa.common.dto.EndpointProfileDto;
 import org.kaaproject.kaa.demo.activation.model.DeviceState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.kaaproject.kaa.demo.activation.utils.AdminClientManager;
 import org.kaaproject.kaa.demo.activation.utils.Utils;
+import org.kaaproject.kaa.schema.system.EmptyData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Base64;
 import java.util.HashMap;
@@ -54,29 +53,42 @@ public static void main(String[] args) throws InterruptedException {
             LOG.info("Possible options:");
             LOG.info(" java -jar ActivationDemo.jar client");
             LOG.info(" java -jar ActivationDemo.jar admin host [port]");
+            LOG.info(" java -jar ActivationDemo.jar developer host [port]");
             return;
         }
 
         String mode = args[0];
         switch (mode) {
-        case "admin":
-            if (args.length < 2) {
-            }
-            if (args.length == 2) {
-                AdminClientManager.init(args[1]);
-            } else if (args.length == 3) {
-                AdminClientManager.init(args[1], Integer.valueOf(args[2]));
-            } else {
-                LOG.info("ip/host is not specified or address is invalid");
-                return;
-            }
-            useAdminClient();
-            break;
-        case "client":
-            useKaaClient();
-            break;
-        default:
-            LOG.info("Invalid parameters. Please specify 'client' or 'admin'");
+            case "developer":
+                if (args.length < 2) {
+                }
+                if (args.length == 2) {
+                    AdminClientManager.init(args[1]);
+                } else if (args.length == 3) {
+                    AdminClientManager.init(args[1], Integer.valueOf(args[2]));
+                } else {
+                    LOG.info("ip/host is not specified or address is invalid");
+                    return;
+                }
+                useDeveloperClient();
+                break;
+            case "admin":
+                if (args.length < 2) {
+                }
+                if (args.length == 2) {
+                    AdminClientManager.init(args[1], AdminClientManager.UserType.TENANT_ADMIN);
+                } else if (args.length == 3) {
+                    AdminClientManager.init(args[1], Integer.valueOf(args[2]), AdminClientManager.UserType.TENANT_ADMIN);
+                } else {
+                    LOG.info("ip/host is not specified or address is invalid");
+                    return;
+                }
+                useAdminClient();
+            case "client":
+                useKaaClient();
+                break;
+            default:
+                LOG.info("Invalid parameters. Please specify 'client' or 'admin' or 'developer'");
 
         }
     }
@@ -100,7 +112,12 @@ public void onStarted() {
                 LOG.info("Device state: " + (config.getActive() ? "active" : "inactive"));
             }
         });
-
+        kaaClient.setProfileContainer(new ProfileContainer() {
+                        @Override
+                        public EmptyData getProfile() {
+                                return new EmptyData();
+                            }
+                    });
         /*
          * Persist configuration in a local storage to avoid downloading it each
          * time the Kaa client is started.
@@ -112,6 +129,7 @@ public void onStarted() {
          * it is updated.
          */
         kaaClient.addConfigurationListener(new ConfigurationListener() {
+            @Override
             public void onConfigurationUpdate(DeviceType deviceType) {
                 LOG.info("Configuration was updated. New device state: " + (deviceType.getActive() ? "active" : "inactive"));
             }
@@ -130,7 +148,26 @@ public void onConfigurationUpdate(DeviceType deviceType) {
         kaaClient.stop();
     }
 
-    private static void useAdminClient() {
+    private static void useAdminClient(){
+        LOG.info("Choose action by entering corresponding number:");
+        while (true){
+            LOG.info("\n1. Generate and provision endpoint credentials.\n2. Revoke endpoint " +
+                    "credentials\n3. Exit");
+            switch(Utils.getUserInput()){
+                case "1":
+                    generateAndProvisionKeys();
+                    break;
+                case "2":
+                    revokeCredentials();
+                    break;
+                default:
+                    System.exit(0);
+            }
+        }
+    }
+
+    private static void useDeveloperClient() {
+
         Map<String, EndpointProfileDto> endpointProfiles = retrieveEndpointProfiles();
         if (endpointProfiles.isEmpty()) {
             LOG.info("There is no endpoints registered!");
@@ -138,6 +175,8 @@ private static void useAdminClient() {
         }
         printAllEndpointProfiles(endpointProfiles);
 
+
+
         for (;;) {
             LOG.info("Specify endpoint profile id# you want to activate/deactivate or print 'exit' to exit");
             String userInput = Utils.getUserInput();
@@ -156,6 +195,20 @@ private static void useAdminClient() {
         }
     }
 
+    private static void generateAndProvisionKeys(){
+        AdminClientManager clientManager = AdminClientManager.instance();
+        LOG.info("Going to generate and provision credentials");
+        clientManager.provideCredentials(APPLICATION_NAME, clientManager.generateKeyPair().getPublic().getEncoded());
+    }
+
+    private static void revokeCredentials(){
+        AdminClientManager clientManager = AdminClientManager.instance();
+        LOG.info("Enter ID of credentials that needs to be revoked:");
+        String credentialsId = Utils.getUserInput();
+        LOG.info("Going to revoke credentials");
+        clientManager.revokeCredentials(APPLICATION_NAME, credentialsId);
+    }
+
     /**
      * Retrieve all endpoint profiles associated with activation application
      *
diff --git a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
index f7a061a30..f28e43f6a 100644
--- a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
+++ b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
@@ -18,11 +18,17 @@
 
 import org.kaaproject.kaa.common.dto.*;
 import org.kaaproject.kaa.common.dto.admin.AuthResultDto;
+import org.kaaproject.kaa.common.dto.credentials.CredentialsDto;
+import org.kaaproject.kaa.common.endpoint.security.KeyUtil;
+import org.kaaproject.kaa.demo.activation.model.DeviceState;
 import org.kaaproject.kaa.server.common.admin.AdminClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.security.KeyPair;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 public class AdminClientManager {
 
@@ -30,14 +36,20 @@ public class AdminClientManager {
 
     private static final String TENANT_DEV_USERNAME = "devuser";
     private static final String TENANT_DEV_PASSWORD = "devuser123";
+
+    private static final String TENANT_ADMIN_USERNAME = "admin";
+    private static final String TENANT_ADMIN_PASSWORD = "admin123";
+
     private static final String DEFAULT_LIMIT = "20";
     private static final String DEFAULT_OFFSET = "0";
     private static final int KAA_PORT = 8080;
 
     private AdminClient adminClient;
     private static AdminClientManager instance;
+    private UserType userType;
 
-    private AdminClientManager(String host, int port) {
+    private AdminClientManager(String host, int port, UserType userType) {
+        this.userType = userType;
         adminClient = new AdminClient(host, port);
     }
 
@@ -46,7 +58,15 @@ public static void init(String host) {
     }
 
     public static void init(String host, int port) {
-        instance = new AdminClientManager(host, port);
+        instance = new AdminClientManager(host, port, UserType.TENANT_DEVELOPER);
+    }
+
+    public static void init(String host, UserType userType){
+        init(host, KAA_PORT, userType);
+    }
+
+    public static void init(String host, int port, UserType userType){
+        instance = new AdminClientManager(host, port, userType);
     }
 
     public static AdminClientManager instance() {
@@ -56,6 +76,30 @@ public static AdminClientManager instance() {
         return instance;
     }
 
+    /**
+     * Generate public and private key pair
+     *
+     * @return Generated KeyPair
+     */
+    public KeyPair generateKeyPair(){
+        return KeyUtil.generateKeyPair("./key.private", "./key.public");
+    }
+
+    public void provideCredentials(String applicationName, byte[] publicKey){
+        CredentialsDto credentialsDto = adminClient.provisionCredentials(getApplicationByName(applicationName).getApplicationToken(),
+                publicKey);
+        adminClient.provisionRegistration(getApplicationByName(applicationName).getApplicationToken(), credentialsDto
+                .getId(), 1, DeviceState.toJsonString(true));
+        LOG.info("APP TOKEN: {}", getApplicationByName(applicationName).getApplicationToken());
+        LOG.info("Credentials with ID={} are now in status: {}", credentialsDto.getId(), credentialsDto.getStatus());
+    }
+
+    public void revokeCredentials(String applicationName, String credentialsId){
+        LOG.info("APP TOKEN: {}", getApplicationByName(applicationName).getApplicationToken());
+        adminClient.revokeCredentials(getApplicationByName(applicationName).getApplicationToken(), credentialsId);
+        LOG.info("Credentials revoked.");
+    }
+
     /**
      * Do authorization check
      *
@@ -76,7 +120,11 @@ public boolean checkAuth() {
      */
     public void checkAuthorizationAndLogin() {
         if (!checkAuth()) {
-            adminClient.login(TENANT_DEV_USERNAME, TENANT_DEV_PASSWORD);
+            if(UserType.TENANT_ADMIN.equals(userType)){
+                adminClient.login(TENANT_ADMIN_USERNAME, TENANT_ADMIN_PASSWORD);
+            }else {
+                adminClient.login(TENANT_DEV_USERNAME, TENANT_DEV_PASSWORD);
+            }
         }
     }
 
@@ -204,4 +252,9 @@ public Map<String, EndpointProfileDto> getEndpointProfiles(List<EndpointGroupDto
         return endpointProfiles;
     }
 
+    public enum UserType {
+        TENANT_ADMIN,
+        TENANT_DEVELOPER
+    }
+
 }
diff --git a/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java b/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
index c82b4a10a..72ea7e5d8 100644
--- a/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
+++ b/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
@@ -52,6 +52,7 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
         ApplicationDto activationApplication = new ApplicationDto();
         activationApplication.setName("Endpoint activation demo");
         activationApplication = client.editApplication(activationApplication);
+        activationApplication.setCredentialsServiceName("Internal");
 
         sdkProfileDto.setApplicationId(activationApplication.getId());
         sdkProfileDto.setApplicationToken(activationApplication.getApplicationToken());

From f9556d631f2aae99af8d57f1c18dc1a9faae283a Mon Sep 17 00:00:00 2001
From: Dmitry Sergeev <deepnekro@gmail.com>
Date: Tue, 26 Apr 2016 16:15:36 +0300
Subject: [PATCH 32/42] APP-64: Fix credentials service setting on application
 provisioning

---
 .../kaa/examples/activation/ActivationDemoBuilder.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java b/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
index 72ea7e5d8..79efe2d6c 100644
--- a/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
+++ b/activationdemo/src/main/java/org/kaaproject/kaa/examples/activation/ActivationDemoBuilder.java
@@ -51,8 +51,9 @@ protected void buildDemoApplicationImpl(AdminClient client) throws Exception {
 
         ApplicationDto activationApplication = new ApplicationDto();
         activationApplication.setName("Endpoint activation demo");
-        activationApplication = client.editApplication(activationApplication);
         activationApplication.setCredentialsServiceName("Internal");
+        activationApplication = client.editApplication(activationApplication);
+
 
         sdkProfileDto.setApplicationId(activationApplication.getId());
         sdkProfileDto.setApplicationToken(activationApplication.getApplicationToken());

From 434c31217fc2953a4dd5ae928b57e47adab9c968 Mon Sep 17 00:00:00 2001
From: Dmitry Sergeev <deepnekro@gmail.com>
Date: Tue, 26 Apr 2016 16:17:52 +0300
Subject: [PATCH 33/42] APP-64: Change log level

---
 .../kaa/demo/activation/utils/AdminClientManager.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
index f28e43f6a..4b9529f3c 100644
--- a/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
+++ b/activationdemo/source/java/src/main/java/org/kaaproject/kaa/demo/activation/utils/AdminClientManager.java
@@ -90,12 +90,12 @@ public void provideCredentials(String applicationName, byte[] publicKey){
                 publicKey);
         adminClient.provisionRegistration(getApplicationByName(applicationName).getApplicationToken(), credentialsDto
                 .getId(), 1, DeviceState.toJsonString(true));
-        LOG.info("APP TOKEN: {}", getApplicationByName(applicationName).getApplicationToken());
+        LOG.debug("APP TOKEN: {}", getApplicationByName(applicationName).getApplicationToken());
         LOG.info("Credentials with ID={} are now in status: {}", credentialsDto.getId(), credentialsDto.getStatus());
     }
 
     public void revokeCredentials(String applicationName, String credentialsId){
-        LOG.info("APP TOKEN: {}", getApplicationByName(applicationName).getApplicationToken());
+        LOG.debug("APP TOKEN: {}", getApplicationByName(applicationName).getApplicationToken());
         adminClient.revokeCredentials(getApplicationByName(applicationName).getApplicationToken(), credentialsId);
         LOG.info("Credentials revoked.");
     }

From f550aabe8aa7fa5ea4b9293d3f755b6be49a63b8 Mon Sep 17 00:00:00 2001
From: Maxim Olender <forgge@gmail.com>
Date: Tue, 26 Apr 2016 21:02:54 +0300
Subject: [PATCH 34/42] APP-77 Fix error when trying to flash cc32xx gpio app

According to documentation, name of the app must contain .afk extension.
Debug symbols are enabled. This is required by GDB script.

See: http://docs.kaaproject.org/display/KAA/Texas+Instruments+CC3200
---
 gpiocontrol/source/cc32xx/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gpiocontrol/source/cc32xx/CMakeLists.txt b/gpiocontrol/source/cc32xx/CMakeLists.txt
index c0bc9bc58..3daf6b863 100644
--- a/gpiocontrol/source/cc32xx/CMakeLists.txt
+++ b/gpiocontrol/source/cc32xx/CMakeLists.txt
@@ -19,10 +19,10 @@ project(C-SDK-sample)
 enable_language(C)
 
 # Target-independent flags.
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -g")
 
 # Our application name.
-set(APP_NAME demo_client)
+set(APP_NAME demo_client.afx)
 
 # Demo executable.
 add_executable(${APP_NAME} src/kaa_demo.c)

From 2c9971734d51a2f903c763d0643a27de7a29d263 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@cybervisiontech.com>
Date: Wed, 27 Apr 2016 13:56:41 +0300
Subject: [PATCH 35/42] APP-79: Update Zeppelin data analytics demo description
 due to migration to Cassandra 3.0

---
 zeppelindemo/resources/projects.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/zeppelindemo/resources/projects.xml b/zeppelindemo/resources/projects.xml
index dd72c9d06..7966b085e 100644
--- a/zeppelindemo/resources/projects.xml
+++ b/zeppelindemo/resources/projects.xml
@@ -58,9 +58,9 @@ password: kaa
 following commands:
 <pre>
 $ cd /opt
-$ sudo wget http://www.eu.apache.org/dist/incubator/zeppelin/0.5.5-incubating/zeppelin-0.5.5-incubating-bin-all.tgz
-$ sudo tar -xzvf zeppelin-0.5.5-incubating-bin-all.tgz
-$ sudo ln -s /opt/zeppelin-0.5.5-incubating-bin-all /opt/zeppelin
+$ sudo wget http://www.eu.apache.org/dist/incubator/zeppelin/0.5.6-incubating/zeppelin-0.5.6-incubating-bin-all.tgz
+$ sudo tar -xzvf zeppelin-0.5.6-incubating-bin-all.tgz
+$ sudo ln -s /opt/zeppelin-0.5.6-incubating-bin-all /opt/zeppelin
 $ cd ./zeppelin/conf
 $ sudo cp ./zeppelin-env.sh.template  ./zeppelin-env.sh
 </pre>
@@ -73,12 +73,18 @@ into the zeppelin-env.sh file. <br />
 <pre>
 $ sudo /opt/zeppelin/bin/zeppelin-daemon.sh start
 </pre>
-6. On your host PC go to the JZeppelinDataAnalyticsDemo/lib folder and rename kaa-java-ep-sdk-<SDK token>.jar to the kaa-java-ep-sdk.jar. <br />
-7. Go to the JZeppelinDataAnalyticsDemo folder and start Zeppelin data analytics demo by executing command:
+6. Configure Cassandra log appenders.
+Navigate to the Kaa server administrative interface by clicking the "Administrative console" link at the top of the Sandbox window.
+Log in as a tenant developer (devuser / devuser123), and navigate to the "Zeppelin data analytics demo" application, then select "Log appenders".
+From here you can manage two log appenders "Panel per row appender" and "Zone per row appender". Update appenders according to your
+Cassandra cluster configuration. Make sure that version of your Cassandra cluster is not higher than 2.2 which Cassandra Zeppelin interpreter
+currently supports.
+7. On your host PC go to the JZeppelinDataAnalyticsDemo/lib folder and rename kaa-java-ep-sdk-<SDK token>.jar to the kaa-java-ep-sdk.jar. <br />
+8. Go to the JZeppelinDataAnalyticsDemo folder and start Zeppelin data analytics demo by executing command:
 <pre>
 $ mvn clean install exec:java
 </pre>
-8. Navigate to the Zeppelin by entering in your browser:
+9. Navigate to the Zeppelin by entering in your browser:
 <pre>
 YOUR-SANDBOX-IP:7080/#/
 </pre>

From 6504bd95291cebee8a11b322c1c05063c8347c24 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@cybervisiontech.com>
Date: Wed, 27 Apr 2016 14:56:54 +0300
Subject: [PATCH 36/42] APP-79: Add line breaks

---
 zeppelindemo/resources/projects.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeppelindemo/resources/projects.xml b/zeppelindemo/resources/projects.xml
index 7966b085e..0a838a916 100644
--- a/zeppelindemo/resources/projects.xml
+++ b/zeppelindemo/resources/projects.xml
@@ -73,12 +73,12 @@ into the zeppelin-env.sh file. <br />
 <pre>
 $ sudo /opt/zeppelin/bin/zeppelin-daemon.sh start
 </pre>
-6. Configure Cassandra log appenders.
+6. Configure Cassandra log appenders.<br />
 Navigate to the Kaa server administrative interface by clicking the "Administrative console" link at the top of the Sandbox window.
 Log in as a tenant developer (devuser / devuser123), and navigate to the "Zeppelin data analytics demo" application, then select "Log appenders".
 From here you can manage two log appenders "Panel per row appender" and "Zone per row appender". Update appenders according to your
 Cassandra cluster configuration. Make sure that version of your Cassandra cluster is not higher than 2.2 which Cassandra Zeppelin interpreter
-currently supports.
+currently supports.<br />
 7. On your host PC go to the JZeppelinDataAnalyticsDemo/lib folder and rename kaa-java-ep-sdk-<SDK token>.jar to the kaa-java-ep-sdk.jar. <br />
 8. Go to the JZeppelinDataAnalyticsDemo folder and start Zeppelin data analytics demo by executing command:
 <pre>

From 096b97563dbe9855be4403323957e206aaac2713 Mon Sep 17 00:00:00 2001
From: RostakaGmfun <rostawesomegd@gmail.com>
Date: Wed, 27 Apr 2016 18:16:04 +0300
Subject: [PATCH 37/42] APP-80: Compilation error fix

---
 stormdemo/source/cpp/CMakeLists.txt  |  2 +-
 stormdemo/source/cpp/src/KaaDemo.cpp | 24 ++----------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/stormdemo/source/cpp/CMakeLists.txt b/stormdemo/source/cpp/CMakeLists.txt
index 5dbd50e48..5cad2fd30 100644
--- a/stormdemo/source/cpp/CMakeLists.txt
+++ b/stormdemo/source/cpp/CMakeLists.txt
@@ -39,7 +39,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L/usr/local/lib -std=gnu++11 -stdlib=libc++")
 endif()
 
-find_package (Boost 1.54 REQUIRED COMPONENTS log system)
+find_package (Boost 1.54 REQUIRED COMPONENTS log system thread)
 find_package (Avro REQUIRED)
 find_package (Botan REQUIRED)
 
diff --git a/stormdemo/source/cpp/src/KaaDemo.cpp b/stormdemo/source/cpp/src/KaaDemo.cpp
index 427af652c..9ebf42180 100644
--- a/stormdemo/source/cpp/src/KaaDemo.cpp
+++ b/stormdemo/source/cpp/src/KaaDemo.cpp
@@ -25,31 +25,11 @@
 
 #include <kaa/Kaa.hpp>
 #include <kaa/log/DefaultLogUploadStrategy.hpp>
+#include <kaa/log/strategies/RecordCountLogUploadStrategy.hpp>
 #include <kaa/log/ILogStorageStatus.hpp>
 
 using namespace kaa;
 
-
-
-// The default strategy uploads logs after either a threshold logs count
-// or a threshold logs size has been reached.
-// The following custom strategy uploads every log record as soon as it is created.
-// Set a custom strategy for uploading logs.
-class LogUploadStrategy : public DefaultLogUploadStrategy {
-public:
-    LogUploadStrategy() : DefaultLogUploadStrategy() {}
-
-    virtual LogUploadStrategyDecision isUploadNeeded(ILogStorageStatus& status)
-    {
-         if (status.getRecordsCount() >= 1) {
-            return LogUploadStrategyDecision::UPLOAD;
-        }
-        return LogUploadStrategyDecision::NOOP;
-    }
-};
-
-
-
 double getRandomDouble(int max) {
     double r = (double) rand() / RAND_MAX;
     return r * max;
@@ -72,7 +52,7 @@ int main()
     auto kaaClient =  Kaa::newClient();
 
     // Set a custom strategy for uploading logs.
-    kaaClient->setLogUploadStrategy(std::make_shared<LogUploadStrategy>());
+    kaaClient->setLogUploadStrategy(std::make_shared<RecordCountLogUploadStrategy>(1, kaaClient->getKaaClientContext()));
 
     // Start the Kaa client and connect it to the Kaa server.
     kaaClient->start();

From e9345fc18b2e05e296e3054d603a7a9eb71f3958 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Wed, 27 Apr 2016 20:53:52 +0300
Subject: [PATCH 38/42] APP-81 Fix CMAKE_BUILD_TYPE

The default CMAKE_BUILD_TYPE is now used instead of custom
KAA_DEBUG_ENABLED.
---
 cassandrademo/source/c/build.sh           | 2 +-
 configurationdemo/source/c/build.sh       | 2 +-
 configurationdemo/source/cpp/build.bat    | 2 +-
 configurationdemo/source/cpp/build.sh     | 2 +-
 configurationdemo/source/esp8266/build.sh | 2 +-
 gpiocontrol/source/esp8266/build.sh       | 2 +-
 notificationdemo/source/c/build.sh        | 2 +-
 notificationdemo/source/cpp/build.bat     | 2 +-
 notificationdemo/source/cpp/build.sh      | 2 +-
 powerplant/source/cpp/build.sh            | 2 +-
 sparkdemo/source/cpp/build.bat            | 2 +-
 sparkdemo/source/cpp/build.sh             | 2 +-
 vehicletelemetry/source/cpp/build.sh      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cassandrademo/source/c/build.sh b/cassandrademo/source/c/build.sh
index 73e91cfa7..3f1312f2b 100755
--- a/cassandrademo/source/c/build.sh
+++ b/cassandrademo/source/c/build.sh
@@ -56,7 +56,7 @@ function build_thirdparty {
     then
         cd $KAA_LIB_PATH &&
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_CONFIGURATION=1 \
               -DKAA_WITHOUT_NOTIFICATION=1 \
diff --git a/configurationdemo/source/c/build.sh b/configurationdemo/source/c/build.sh
index 94437792c..64cadbd3b 100755
--- a/configurationdemo/source/c/build.sh
+++ b/configurationdemo/source/c/build.sh
@@ -111,7 +111,7 @@ function build_app {
           -DKAA_PRODUCE_BINARY=$KAA_PRODUCE_BINARY \
           -DWIFI_SSID=$SSID \
           -DWIFI_PASSWORD=$PASSWORD \
-          -DKAA_DEBUG_ENABLED=1 \
+          -DCMAKE_BUILD_TYPE=Debug \
           -DKAA_WITHOUT_EVENTS=1 \
           -DKAA_WITHOUT_LOGGING=1 \
           -DKAA_MAX_LOG_LEVEL=3 \
diff --git a/configurationdemo/source/cpp/build.bat b/configurationdemo/source/cpp/build.bat
index fd2685f4e..d5f5294c3 100755
--- a/configurationdemo/source/cpp/build.bat
+++ b/configurationdemo/source/cpp/build.bat
@@ -76,7 +76,7 @@ goto help
         md %BUILD_DIR%
         cd %BUILD_DIR%
         cmake -G "NMake Makefiles" ^
-	      -DKAA_DEBUG_ENABLED=1 ^
+	      -DCMAKE_BUILD_TYPE=Debug ^
               -DKAA_WITHOUT_EVENTS=1 ^
               -DKAA_WITHOUT_LOGGING=1 ^
               -DKAA_WITHOUT_NOTIFICATIONS=1 ^
diff --git a/configurationdemo/source/cpp/build.sh b/configurationdemo/source/cpp/build.sh
index 557284ecb..2f910bb80 100755
--- a/configurationdemo/source/cpp/build.sh
+++ b/configurationdemo/source/cpp/build.sh
@@ -73,7 +73,7 @@ function build_thirdparty {
         chmod 755 ./avrogen.sh &&
         ./avrogen.sh && 
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_LOGGING=1 \
               -DKAA_WITHOUT_NOTIFICATIONS=1 \
diff --git a/configurationdemo/source/esp8266/build.sh b/configurationdemo/source/esp8266/build.sh
index 753cd9a92..5f039268f 100755
--- a/configurationdemo/source/esp8266/build.sh
+++ b/configurationdemo/source/esp8266/build.sh
@@ -61,7 +61,7 @@ function build_thirdparty {
     then
         cd $KAA_LIB_PATH &&
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=0 \
+        cmake -DCMAKE_BUILD_TYPE=MinSizeRel \
               -DKAA_MAX_LOG_LEVEL=4 \
               -DKAA_PLATFORM=esp8266 \
               -DCMAKE_TOOLCHAIN_FILE=../toolchains/esp8266.cmake \
diff --git a/gpiocontrol/source/esp8266/build.sh b/gpiocontrol/source/esp8266/build.sh
index 194d71b31..043cd0db1 100755
--- a/gpiocontrol/source/esp8266/build.sh
+++ b/gpiocontrol/source/esp8266/build.sh
@@ -68,7 +68,7 @@ function build_thirdparty {
     then
         cd $KAA_LIB_PATH &&
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=0 \
+        cmake -DCMAKE_BUILD_TYPE=MinSizeRel \
               -DKAA_MAX_LOG_LEVEL=3 \
               -DKAA_PLATFORM=esp8266 \
               -DCMAKE_TOOLCHAIN_FILE=../toolchains/esp8266.cmake \
diff --git a/notificationdemo/source/c/build.sh b/notificationdemo/source/c/build.sh
index 4978aae0e..dad9aee40 100755
--- a/notificationdemo/source/c/build.sh
+++ b/notificationdemo/source/c/build.sh
@@ -73,7 +73,7 @@ function build_thirdparty {
     then
         cd $KAA_LIB_PATH &&
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_CONFIGURATION=1 \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_LOGGING=1 \
diff --git a/notificationdemo/source/cpp/build.bat b/notificationdemo/source/cpp/build.bat
index 68b061780..cc8cc919e 100755
--- a/notificationdemo/source/cpp/build.bat
+++ b/notificationdemo/source/cpp/build.bat
@@ -76,7 +76,7 @@ goto help
         md %BUILD_DIR%
         cd %BUILD_DIR%
         cmake -G "NMake Makefiles" ^
-	      -DKAA_DEBUG_ENABLED=1 ^
+	      -DCMAKE_BUILD_TYPE=Debug ^
               -DKAA_WITHOUT_EVENTS=1 ^
               -DKAA_WITHOUT_CONFIGURATION=1 ^
               -DKAA_WITHOUT_LOGGING=1 ^
diff --git a/notificationdemo/source/cpp/build.sh b/notificationdemo/source/cpp/build.sh
index c62c64629..383abeb2e 100755
--- a/notificationdemo/source/cpp/build.sh
+++ b/notificationdemo/source/cpp/build.sh
@@ -73,7 +73,7 @@ function build_thirdparty {
         chmod 755 ./avrogen.sh &&
         ./avrogen.sh && 
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_CONFIGURATION=1 \
               -DKAA_WITHOUT_LOGGING=1 \
diff --git a/powerplant/source/cpp/build.sh b/powerplant/source/cpp/build.sh
index f6fc18c39..8664bcc86 100755
--- a/powerplant/source/cpp/build.sh
+++ b/powerplant/source/cpp/build.sh
@@ -61,7 +61,7 @@ function build_thirdparty {
         chmod 755 ./avrogen.sh &&
         ./avrogen.sh && 
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_NOTIFICATIONS=1 \
               -DKAA_WITHOUT_OPERATION_LONG_POLL_CHANNEL=1 \
diff --git a/sparkdemo/source/cpp/build.bat b/sparkdemo/source/cpp/build.bat
index 96fc9aba7..a17405aa8 100755
--- a/sparkdemo/source/cpp/build.bat
+++ b/sparkdemo/source/cpp/build.bat
@@ -76,7 +76,7 @@ goto help
         md %BUILD_DIR%
         cd %BUILD_DIR%
         cmake -G "NMake Makefiles" ^
-          -DKAA_DEBUG_ENABLED=1 ^
+          -DCMAKE_BUILD_TYPE=Debug ^
               -DKAA_WITHOUT_EVENTS=1 ^
               -DKAA_WITHOUT_CONFIGURATION=1 ^
               -DKAA_WITHOUT_NOTIFICATIONS=1 ^
diff --git a/sparkdemo/source/cpp/build.sh b/sparkdemo/source/cpp/build.sh
index 7ac81fb1d..5b307c09b 100755
--- a/sparkdemo/source/cpp/build.sh
+++ b/sparkdemo/source/cpp/build.sh
@@ -73,7 +73,7 @@ function build_thirdparty {
         chmod 755 ./avrogen.sh &&
         ./avrogen.sh && 
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_CONFIGURATION=1 \
               -DKAA_WITHOUT_NOTIFICATIONS=1 \
diff --git a/vehicletelemetry/source/cpp/build.sh b/vehicletelemetry/source/cpp/build.sh
index 37685563f..02749743a 100755
--- a/vehicletelemetry/source/cpp/build.sh
+++ b/vehicletelemetry/source/cpp/build.sh
@@ -58,7 +58,7 @@ function build_thirdparty {
         chmod 755 ./avrogen.sh &&
         ./avrogen.sh && 
         mkdir -p $BUILD_DIR && cd $BUILD_DIR &&
-        cmake -DKAA_DEBUG_ENABLED=1 \
+        cmake -DCMAKE_BUILD_TYPE=Debug \
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_CONFIGURATION=1 \
               -DKAA_WITHOUT_NOTIFICATIONS=1 \

From 2e76bf89ff51bf4fddde6cb5cc370ffae13e7f9d Mon Sep 17 00:00:00 2001
From: RostakaGmfun <rostawesomegd@gmail.com>
Date: Wed, 27 Apr 2016 21:17:04 +0300
Subject: [PATCH 39/42] APP-83: Cassandra demo compilation error fix

---
 cassandrademo/source/c/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cassandrademo/source/c/CMakeLists.txt b/cassandrademo/source/c/CMakeLists.txt
index 126b7cdd2..98a65f661 100644
--- a/cassandrademo/source/c/CMakeLists.txt
+++ b/cassandrademo/source/c/CMakeLists.txt
@@ -20,6 +20,7 @@ project (C-SDK-sample)
 enable_language(C)
 
 find_package (OpenSSL REQUIRED)
+find_package (Threads REQUIRED)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -g -Wall -Wextra")
 
@@ -35,4 +36,4 @@ set (SAMPLE_SOURCE_FILES
 )
 
 add_executable(${APP_NAME} ${SAMPLE_SOURCE_FILES})
-target_link_libraries(${APP_NAME} kaac crypto wiringPi)
+target_link_libraries(${APP_NAME} kaac crypto wiringPi ${CMAKE_THREAD_LIBS_INIT})

From 28f7f4277c26d7fadf8c36e54f74dbd03faead80 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Wed, 27 Apr 2016 21:35:46 +0300
Subject: [PATCH 40/42] APP-84 Add missing include for storm demo

---
 stormdemo/source/c/src/kaa_demo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stormdemo/source/c/src/kaa_demo.c b/stormdemo/source/c/src/kaa_demo.c
index 43d8e969e..f908bb9b6 100644
--- a/stormdemo/source/c/src/kaa_demo.c
+++ b/stormdemo/source/c/src/kaa_demo.c
@@ -25,6 +25,7 @@
 #include <kaa/kaa_context.h>
 #include <kaa/platform/kaa_client.h>
 #include <kaa/kaa_logging.h>
+#include <kaa/utilities/kaa_log.h>
 #include <kaa/platform-impl/common/ext_log_upload_strategies.h>
 
 

From ef08bb7c66e85d7145994c82e83471714e9e8ce2 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Wed, 27 Apr 2016 23:03:24 +0300
Subject: [PATCH 41/42] APP-81 Add -mlongcalls compiler flag

---
 configurationdemo/source/esp8266/build.sh | 1 +
 gpiocontrol/source/esp8266/build.sh       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configurationdemo/source/esp8266/build.sh b/configurationdemo/source/esp8266/build.sh
index 5f039268f..201ef6c54 100755
--- a/configurationdemo/source/esp8266/build.sh
+++ b/configurationdemo/source/esp8266/build.sh
@@ -68,6 +68,7 @@ function build_thirdparty {
               -DKAA_WITHOUT_EVENTS=1 \
               -DKAA_WITHOUT_NOTIFICATION=1 \
               -DKAA_WITHOUT_LOGGING=1 \
+              -DCMAKE_C_FLAGS='-mlongcalls' \
               ..
     fi
 
diff --git a/gpiocontrol/source/esp8266/build.sh b/gpiocontrol/source/esp8266/build.sh
index 043cd0db1..c7b88044a 100755
--- a/gpiocontrol/source/esp8266/build.sh
+++ b/gpiocontrol/source/esp8266/build.sh
@@ -75,6 +75,7 @@ function build_thirdparty {
               -DKAA_WITHOUT_NOTIFICATION=1 \
               -DKAA_WITHOUT_LOGGING=1 \
               -DKAA_WITHOUT_CONFIGURATION=1 \
+              -DCMAKE_C_FLAGS='-mlongcalls' \
               ..
     fi
 

From 35ab5e4a2ad7ff8d3d61c4e07c0e0088bb2548d3 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov82@gmail.com>
Date: Thu, 28 Apr 2016 02:01:43 +0300
Subject: [PATCH 42/42] Version set to 1.3.0

---
 activationdemo/pom.xml                     | 2 +-
 cassandrademo/pom.xml                      | 2 +-
 cellmonitor/pom.xml                        | 2 +-
 cityguide/pom.xml                          | 2 +-
 citylights-controller/pom.xml              | 2 +-
 common/pom.xml                             | 2 +-
 configurationdemo/pom.xml                  | 2 +-
 connectedcar/pom.xml                       | 2 +-
 datacollectiondemo/pom.xml                 | 2 +-
 econais/ec19d/pom.xml                      | 2 +-
 econais/ec19d/streetlight-driver/pom.xml   | 2 +-
 econais/ec19d/trafficlights-driver/pom.xml | 2 +-
 econais/pom.xml                            | 2 +-
 eventdemo/pom.xml                          | 2 +-
 gpiocontrol/pom.xml                        | 2 +-
 iotworld/pom.xml                           | 2 +-
 notificationdemo/pom.xml                   | 2 +-
 ota/pom.xml                                | 2 +-
 photoframe/pom.xml                         | 2 +-
 pom.xml                                    | 4 ++--
 powerplant-android/pom.xml                 | 2 +-
 powerplant-couchbase-proxy/pom.xml         | 2 +-
 powerplant-dashboard/pom.xml               | 2 +-
 powerplant/pom.xml                         | 2 +-
 smarthousedemo/pom.xml                     | 2 +-
 sparkdemo/pom.xml                          | 2 +-
 stormdemo/pom.xml                          | 2 +-
 twitterled/pom.xml                         | 2 +-
 twitterled/twitterboard/pom.xml            | 2 +-
 twitterled/twittermonitor/pom.xml          | 2 +-
 vehicletelemetry/pom.xml                   | 2 +-
 verifiersdemo/pom.xml                      | 2 +-
 zeppelindemo/pom.xml                       | 2 +-
 zeppelindemo/source/java/pom.xml           | 2 +-
 34 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/activationdemo/pom.xml b/activationdemo/pom.xml
index 2fd7de3f8..41a2069c4 100644
--- a/activationdemo/pom.xml
+++ b/activationdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cassandrademo/pom.xml b/cassandrademo/pom.xml
index 48422b920..f2c75b3db 100644
--- a/cassandrademo/pom.xml
+++ b/cassandrademo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cellmonitor/pom.xml b/cellmonitor/pom.xml
index d927c9922..14ca8779e 100644
--- a/cellmonitor/pom.xml
+++ b/cellmonitor/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/cityguide/pom.xml b/cityguide/pom.xml
index e791b8703..ba4ff84d8 100644
--- a/cityguide/pom.xml
+++ b/cityguide/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/citylights-controller/pom.xml b/citylights-controller/pom.xml
index bb71edc8a..3694856ee 100644
--- a/citylights-controller/pom.xml
+++ b/citylights-controller/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index aa6fec5be..6c12613ba 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/configurationdemo/pom.xml b/configurationdemo/pom.xml
index 513da582f..7aac9e740 100644
--- a/configurationdemo/pom.xml
+++ b/configurationdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/connectedcar/pom.xml b/connectedcar/pom.xml
index eb8d29f97..2e09f3cd6 100644
--- a/connectedcar/pom.xml
+++ b/connectedcar/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/datacollectiondemo/pom.xml b/datacollectiondemo/pom.xml
index 40945e20b..ad10478f3 100644
--- a/datacollectiondemo/pom.xml
+++ b/datacollectiondemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/econais/ec19d/pom.xml b/econais/ec19d/pom.xml
index 7baa707be..7c373f5f4 100644
--- a/econais/ec19d/pom.xml
+++ b/econais/ec19d/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>econais</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais</groupId>
diff --git a/econais/ec19d/streetlight-driver/pom.xml b/econais/ec19d/streetlight-driver/pom.xml
index 7977185b4..7cf499f8c 100644
--- a/econais/ec19d/streetlight-driver/pom.xml
+++ b/econais/ec19d/streetlight-driver/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples.econais</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>ec19d</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais.ec19d</groupId>
diff --git a/econais/ec19d/trafficlights-driver/pom.xml b/econais/ec19d/trafficlights-driver/pom.xml
index d1f66cd68..15050f926 100644
--- a/econais/ec19d/trafficlights-driver/pom.xml
+++ b/econais/ec19d/trafficlights-driver/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples.econais</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>ec19d</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.econais.ec19d</groupId>
diff --git a/econais/pom.xml b/econais/pom.xml
index 5dedea0cc..e379bbcad 100644
--- a/econais/pom.xml
+++ b/econais/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/eventdemo/pom.xml b/eventdemo/pom.xml
index 5ce06fa24..b3647a65b 100644
--- a/eventdemo/pom.xml
+++ b/eventdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/gpiocontrol/pom.xml b/gpiocontrol/pom.xml
index 8a84c610a..80682e02f 100644
--- a/gpiocontrol/pom.xml
+++ b/gpiocontrol/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/iotworld/pom.xml b/iotworld/pom.xml
index 559427bf9..940f36c8c 100644
--- a/iotworld/pom.xml
+++ b/iotworld/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/notificationdemo/pom.xml b/notificationdemo/pom.xml
index 2cba7cd4f..064020b76 100644
--- a/notificationdemo/pom.xml
+++ b/notificationdemo/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/ota/pom.xml b/ota/pom.xml
index a69522449..c7c884e04 100644
--- a/ota/pom.xml
+++ b/ota/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/photoframe/pom.xml b/photoframe/pom.xml
index 26ba7dc49..b7cfc3983 100644
--- a/photoframe/pom.xml
+++ b/photoframe/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/pom.xml b/pom.xml
index f1936f595..83fa8de6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.kaaproject.kaa</groupId>
     <artifactId>examples</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.0</version>
     <packaging>pom</packaging>
 
     <name>Sample applications for Kaa Sandbox</name>
@@ -27,7 +27,7 @@
 
     <properties>
         <main.dir>${basedir}</main.dir>
-        <kaa.version>0.9.0-SNAPSHOT</kaa.version>
+        <kaa.version>0.9.0</kaa.version>
         <jackson.version>2.4.1</jackson.version>
         <avro.version>1.7.5</avro.version>
         <junit.version>4.11</junit.version>
diff --git a/powerplant-android/pom.xml b/powerplant-android/pom.xml
index a6e40dad1..7ecd7d317 100644
--- a/powerplant-android/pom.xml
+++ b/powerplant-android/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant-couchbase-proxy/pom.xml b/powerplant-couchbase-proxy/pom.xml
index 2c64de59e..4f07013f5 100644
--- a/powerplant-couchbase-proxy/pom.xml
+++ b/powerplant-couchbase-proxy/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant-dashboard/pom.xml b/powerplant-dashboard/pom.xml
index 41a9f10c2..b01b57867 100644
--- a/powerplant-dashboard/pom.xml
+++ b/powerplant-dashboard/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/powerplant/pom.xml b/powerplant/pom.xml
index b44543b1f..e9d0aa8a5 100644
--- a/powerplant/pom.xml
+++ b/powerplant/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/smarthousedemo/pom.xml b/smarthousedemo/pom.xml
index c1a58dd8a..2e5799b3e 100644
--- a/smarthousedemo/pom.xml
+++ b/smarthousedemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/sparkdemo/pom.xml b/sparkdemo/pom.xml
index 5a2d3bbe1..93723f17b 100644
--- a/sparkdemo/pom.xml
+++ b/sparkdemo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/stormdemo/pom.xml b/stormdemo/pom.xml
index 4671dc251..adf0916ff 100644
--- a/stormdemo/pom.xml
+++ b/stormdemo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
     </parent>
 
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/twitterled/pom.xml b/twitterled/pom.xml
index 2b5b1d9b2..5e6eff25e 100644
--- a/twitterled/pom.xml
+++ b/twitterled/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/twitterled/twitterboard/pom.xml b/twitterled/twitterboard/pom.xml
index 039f89632..b27b495c6 100644
--- a/twitterled/twitterboard/pom.xml
+++ b/twitterled/twitterboard/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>twitterled</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.twitterled</groupId>
diff --git a/twitterled/twittermonitor/pom.xml b/twitterled/twittermonitor/pom.xml
index ecf743af6..aac0109fd 100644
--- a/twitterled/twittermonitor/pom.xml
+++ b/twitterled/twittermonitor/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa.examples</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>twitterled</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples.twitterled</groupId>
diff --git a/vehicletelemetry/pom.xml b/vehicletelemetry/pom.xml
index f95bfcc8a..ef6924192 100644
--- a/vehicletelemetry/pom.xml
+++ b/vehicletelemetry/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/verifiersdemo/pom.xml b/verifiersdemo/pom.xml
index 0f7e55f1f..2c6f25361 100644
--- a/verifiersdemo/pom.xml
+++ b/verifiersdemo/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.kaaproject.kaa</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.0</version>
         <artifactId>examples</artifactId>
     </parent>
     <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/zeppelindemo/pom.xml b/zeppelindemo/pom.xml
index b52b3a32d..959e07750 100644
--- a/zeppelindemo/pom.xml
+++ b/zeppelindemo/pom.xml
@@ -21,7 +21,7 @@
 <parent>
     <artifactId>examples</artifactId>
     <groupId>org.kaaproject.kaa</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.0</version>
 </parent>
 
 <groupId>org.kaaproject.kaa.examples</groupId>
diff --git a/zeppelindemo/source/java/pom.xml b/zeppelindemo/source/java/pom.xml
index 80136afbd..54acd001f 100644
--- a/zeppelindemo/source/java/pom.xml
+++ b/zeppelindemo/source/java/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>org.kaaproject.kaa.demo.zeppelin</groupId>
     <artifactId>simulator</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.0</version>
     <packaging>jar</packaging>
 
     <name>Kaa, Cassandra, Zeppelin demo</name>