ns-notificationpersistent branch 0.1sandbox/ToshikazuOhiwa/ns-notificationpersistent

57 files changed, 60 insertions, 58 deletions

diff --git a/native_service.mk b/native_service.mk
index 5cf73b78..729362ca 100644
--- a/native_service.mk
+++ b/native_service.mk
@@ -1,7 +1,7 @@
 #############################################################
 #
 # Common Makefile for native_service
-# Copyright (C) 2017-2019 TOYOTA MOTOR CORPORATION
+# Copyright (C) 2017-2020 TOYOTA MOTOR CORPORATION
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/Makefile.server b/notification_persistent_service/Makefile.server
index 49707135..13475190 100644
--- a/notification_persistent_service/Makefile.server
+++ b/notification_persistent_service/Makefile.server
@@ -1,5 +1,5 @@
 #
-# @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION.
+# @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/Makefile b/notification_persistent_service/server/Makefile
index 77a67fe6..b5b80cb9 100644
--- a/notification_persistent_service/server/Makefile
+++ b/notification_persistent_service/server/Makefile
@@ -1,5 +1,5 @@
 #
-# @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+# @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/app_states.h b/notification_persistent_service/server/include/app_states.h
index bcc5f2cc..a7f4b4a0 100644
--- a/notification_persistent_service/server/include/app_states.h
+++ b/notification_persistent_service/server/include/app_states.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/native_service/notification_persistent_service.h b/notification_persistent_service/server/include/native_service/notification_persistent_service.h
index 7a780e4d..a7c9f8ec 100644
--- a/notification_persistent_service/server/include/native_service/notification_persistent_service.h
+++ b/notification_persistent_service/server/include/native_service/notification_persistent_service.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2017-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2017-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp.h b/notification_persistent_service/server/include/ns_npp.h
index 9fdb41d5..f96dd755 100644
--- a/notification_persistent_service/server/include/ns_npp.h
+++ b/notification_persistent_service/server/include/ns_npp.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_binary_accesser.h b/notification_persistent_service/server/include/ns_npp_binary_accesser.h
index 4457f34e..aed4d2a8 100644
--- a/notification_persistent_service/server/include/ns_npp_binary_accesser.h
+++ b/notification_persistent_service/server/include/ns_npp_binary_accesser.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_copy_worker.h b/notification_persistent_service/server/include/ns_npp_copy_worker.h
index 4b3cbf2b..984296f6 100644
--- a/notification_persistent_service/server/include/ns_npp_copy_worker.h
+++ b/notification_persistent_service/server/include/ns_npp_copy_worker.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_fs_directory.h b/notification_persistent_service/server/include/ns_npp_fs_directory.h
index cd723f09..4f7876db 100644
--- a/notification_persistent_service/server/include/ns_npp_fs_directory.h
+++ b/notification_persistent_service/server/include/ns_npp_fs_directory.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_handlelist.h b/notification_persistent_service/server/include/ns_npp_handlelist.h
index 03eebb16..30c8a26f 100644
--- a/notification_persistent_service/server/include/ns_npp_handlelist.h
+++ b/notification_persistent_service/server/include/ns_npp_handlelist.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h b/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h
index 4ef731b2..a3994ca0 100644
--- a/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h
+++ b/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_notification.h b/notification_persistent_service/server/include/ns_npp_notification.h
index 642335ed..673e54cd 100644
--- a/notification_persistent_service/server/include/ns_npp_notification.h
+++ b/notification_persistent_service/server/include/ns_npp_notification.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_notification_manager.h b/notification_persistent_service/server/include/ns_npp_notification_manager.h
index 837e0ff6..e730d02a 100644
--- a/notification_persistent_service/server/include/ns_npp_notification_manager.h
+++ b/notification_persistent_service/server/include/ns_npp_notification_manager.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_notification_receiver.h b/notification_persistent_service/server/include/ns_npp_notification_receiver.h
index 79fa4577..09f6b151 100644
--- a/notification_persistent_service/server/include/ns_npp_notification_receiver.h
+++ b/notification_persistent_service/server/include/ns_npp_notification_receiver.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h b/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h
index 05ba1b73..e668af6a 100644
--- a/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h
+++ b/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_persist_file.h b/notification_persistent_service/server/include/ns_npp_persist_file.h
index 61a5363b..04468bee 100644
--- a/notification_persistent_service/server/include/ns_npp_persist_file.h
+++ b/notification_persistent_service/server/include/ns_npp_persist_file.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_persist_folder.h b/notification_persistent_service/server/include/ns_npp_persist_folder.h
index 4534099e..39cf9753 100644
--- a/notification_persistent_service/server/include/ns_npp_persist_folder.h
+++ b/notification_persistent_service/server/include/ns_npp_persist_folder.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_persistence.h b/notification_persistent_service/server/include/ns_npp_persistence.h
index 63e4b9ca..d84f9fbe 100644
--- a/notification_persistent_service/server/include/ns_npp_persistence.h
+++ b/notification_persistent_service/server/include/ns_npp_persistence.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_persistence_manager.h b/notification_persistent_service/server/include/ns_npp_persistence_manager.h
index 65e4ad27..99f98d7e 100644
--- a/notification_persistent_service/server/include/ns_npp_persistence_manager.h
+++ b/notification_persistent_service/server/include/ns_npp_persistence_manager.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_persistent_accesser.h b/notification_persistent_service/server/include/ns_npp_persistent_accesser.h
index eaa90736..bfb15386 100644
--- a/notification_persistent_service/server/include/ns_npp_persistent_accesser.h
+++ b/notification_persistent_service/server/include/ns_npp_persistent_accesser.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_persistent_data.h b/notification_persistent_service/server/include/ns_npp_persistent_data.h
index ec127140..84e2b433 100644
--- a/notification_persistent_service/server/include/ns_npp_persistent_data.h
+++ b/notification_persistent_service/server/include/ns_npp_persistent_data.h
@@ -1,5 +1,5 @@
   /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_personality.h b/notification_persistent_service/server/include/ns_npp_personality.h
index f760b5d5..9ac052f2 100644
--- a/notification_persistent_service/server/include/ns_npp_personality.h
+++ b/notification_persistent_service/server/include/ns_npp_personality.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_personalization_manager.h b/notification_persistent_service/server/include/ns_npp_personalization_manager.h
index 6b8165dc..b1042fbe 100644
--- a/notification_persistent_service/server/include/ns_npp_personalization_manager.h
+++ b/notification_persistent_service/server/include/ns_npp_personalization_manager.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h b/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h
index 2de9949a..13b96a23 100644
--- a/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h
+++ b/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_registry_entry.h b/notification_persistent_service/server/include/ns_npp_registry_entry.h
index 9394fc11..3cb475ee 100644
--- a/notification_persistent_service/server/include/ns_npp_registry_entry.h
+++ b/notification_persistent_service/server/include/ns_npp_registry_entry.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_regular_notification.h b/notification_persistent_service/server/include/ns_npp_regular_notification.h
index 065e0b34..da5427de 100644
--- a/notification_persistent_service/server/include/ns_npp_regular_notification.h
+++ b/notification_persistent_service/server/include/ns_npp_regular_notification.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h b/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h
index 30675300..26edf734 100644
--- a/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h
+++ b/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_state_notification.h b/notification_persistent_service/server/include/ns_npp_state_notification.h
index 9b5b444e..aaa69927 100644
--- a/notification_persistent_service/server/include/ns_npp_state_notification.h
+++ b/notification_persistent_service/server/include/ns_npp_state_notification.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h b/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h
index 8eb44006..1123941c 100644
--- a/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h
+++ b/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h b/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h
index 0d186ded..8423e3e9 100644
--- a/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h
+++ b/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_threads.h b/notification_persistent_service/server/include/ns_npp_threads.h
index d2830c3a..042e8579 100644
--- a/notification_persistent_service/server/include/ns_npp_threads.h
+++ b/notification_persistent_service/server/include/ns_npp_threads.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/include/ns_npp_types.h b/notification_persistent_service/server/include/ns_npp_types.h
index 9e568fe9..79a44d74 100644
--- a/notification_persistent_service/server/include/ns_npp_types.h
+++ b/notification_persistent_service/server/include/ns_npp_types.h
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,8 @@
 // name of NSNPS version file
 #define VERSION_TXT             "version.txt"
 
+#define STORAGE_PATH             "/nv/BS/ns/npp/rwdata/"
+
 
 typedef enum ENPSLoadType {
   LOADTYPE_NONE    = -1,
diff --git a/notification_persistent_service/server/src/app_states.cpp b/notification_persistent_service/server/src/app_states.cpp
index 6d49da45..c54508b1 100644
--- a/notification_persistent_service/server/src/app_states.cpp
+++ b/notification_persistent_service/server/src/app_states.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/notificationpersistentservice_application.cpp b/notification_persistent_service/server/src/notificationpersistentservice_application.cpp
index 51c6f0fa..c1b97f96 100644
--- a/notification_persistent_service/server/src/notificationpersistentservice_application.cpp
+++ b/notification_persistent_service/server/src/notificationpersistentservice_application.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/notificationpersistentservice_main.cpp b/notification_persistent_service/server/src/notificationpersistentservice_main.cpp
index 5fd011fe..fd963c5f 100644
--- a/notification_persistent_service/server/src/notificationpersistentservice_main.cpp
+++ b/notification_persistent_service/server/src/notificationpersistentservice_main.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp.cpp b/notification_persistent_service/server/src/ns_npp.cpp
index f9dc9d8a..25b64432 100644
--- a/notification_persistent_service/server/src/ns_npp.cpp
+++ b/notification_persistent_service/server/src/ns_npp.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_archive.cpp b/notification_persistent_service/server/src/ns_npp_archive.cpp
index beaf9662..b54faebd 100644
--- a/notification_persistent_service/server/src/ns_npp_archive.cpp
+++ b/notification_persistent_service/server/src/ns_npp_archive.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp b/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp
index 96b9c2fd..e0a749f7 100644
--- a/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp
+++ b/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_copy_worker.cpp b/notification_persistent_service/server/src/ns_npp_copy_worker.cpp
index 2f385995..4638a7d4 100644
--- a/notification_persistent_service/server/src/ns_npp_copy_worker.cpp
+++ b/notification_persistent_service/server/src/ns_npp_copy_worker.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_fs_directory.cpp b/notification_persistent_service/server/src/ns_npp_fs_directory.cpp
index 6149e3a8..8f4f98a0 100644
--- a/notification_persistent_service/server/src/ns_npp_fs_directory.cpp
+++ b/notification_persistent_service/server/src/ns_npp_fs_directory.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_handlelist.cpp b/notification_persistent_service/server/src/ns_npp_handlelist.cpp
index fe0ab436..c9e88a8c 100644
--- a/notification_persistent_service/server/src/ns_npp_handlelist.cpp
+++ b/notification_persistent_service/server/src/ns_npp_handlelist.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp b/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp
index d8dd782e..d4b1604f 100644
--- a/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp
+++ b/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_notification.cpp b/notification_persistent_service/server/src/ns_npp_notification.cpp
index 64a1a452..8e2bb2d6 100644
--- a/notification_persistent_service/server/src/ns_npp_notification.cpp
+++ b/notification_persistent_service/server/src/ns_npp_notification.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_notification_manager.cpp b/notification_persistent_service/server/src/ns_npp_notification_manager.cpp
index 9ae22485..73ce8382 100644
--- a/notification_persistent_service/server/src/ns_npp_notification_manager.cpp
+++ b/notification_persistent_service/server/src/ns_npp_notification_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp b/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp
index e49ce222..53b9eab8 100644
--- a/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp
+++ b/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_persist_file.cpp b/notification_persistent_service/server/src/ns_npp_persist_file.cpp
index 89e3e8f0..4b0e4522 100644
--- a/notification_persistent_service/server/src/ns_npp_persist_file.cpp
+++ b/notification_persistent_service/server/src/ns_npp_persist_file.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_persist_folder.cpp b/notification_persistent_service/server/src/ns_npp_persist_folder.cpp
index 0816d06e..87b1ed49 100644
--- a/notification_persistent_service/server/src/ns_npp_persist_folder.cpp
+++ b/notification_persistent_service/server/src/ns_npp_persist_folder.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_persistence.cpp b/notification_persistent_service/server/src/ns_npp_persistence.cpp
index 68add4e4..a39b8360 100644
--- a/notification_persistent_service/server/src/ns_npp_persistence.cpp
+++ b/notification_persistent_service/server/src/ns_npp_persistence.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ VOID CPersistence::SetWriteThreadHandle(HANDLE f_hwritethread) {
 ///
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 std::string CPersistence::GetStoragePath() {
-  std::string l_cStoragePath(PF_SYS_NPP);
+  std::string l_cStoragePath(STORAGE_PATH);
 
   return l_cStoragePath;
 }
diff --git a/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp b/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp
index f48e2d9a..7f5d292f 100644
--- a/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp
+++ b/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_persistent_data.cpp b/notification_persistent_service/server/src/ns_npp_persistent_data.cpp
index b4351430..8a9127ef 100644
--- a/notification_persistent_service/server/src/ns_npp_persistent_data.cpp
+++ b/notification_persistent_service/server/src/ns_npp_persistent_data.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp b/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp
index 6f720c97..43714653 100644
--- a/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp
+++ b/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_registry_entry.cpp b/notification_persistent_service/server/src/ns_npp_registry_entry.cpp
index 18b43a82..dc745808 100644
--- a/notification_persistent_service/server/src/ns_npp_registry_entry.cpp
+++ b/notification_persistent_service/server/src/ns_npp_registry_entry.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_regular_notification.cpp b/notification_persistent_service/server/src/ns_npp_regular_notification.cpp
index 6088f56c..6d75091e 100644
--- a/notification_persistent_service/server/src/ns_npp_regular_notification.cpp
+++ b/notification_persistent_service/server/src/ns_npp_regular_notification.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp b/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp
index 5c4caa1c..7898f38e 100644
--- a/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp
+++ b/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_state_notification.cpp b/notification_persistent_service/server/src/ns_npp_state_notification.cpp
index 2f79b9a1..ff8f054f 100644
--- a/notification_persistent_service/server/src/ns_npp_state_notification.cpp
+++ b/notification_persistent_service/server/src/ns_npp_state_notification.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp b/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp
index d81303f0..1bb9dd11 100644
--- a/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp
+++ b/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp b/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp
index e82a71c8..222ada31 100644
--- a/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp
+++ b/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp
@@ -1,5 +1,5 @@
 /*
- * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION.
+ * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.