Simpliefied public headers names.

key-manager.h was renamed to ckm-manager.h
key-manager-control.h was renamed to ckm-control.h

Change-Id: Ia76e6891dfe8196e2a5d7db8c55a50a1ab33afdd

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 69e1113..adc0dcb 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -161,8 +161,8 @@ fi
 %{_libdir}/libkey-manager-client.so
 %{_libdir}/libkey-manager-control-client.so
 %{_libdir}/libkey-manager-commons.so
-%{_includedir}/ckm/ckm/key-manager.h
-%{_includedir}/ckm/ckm/key-manager-control.h
+%{_includedir}/ckm/ckm/ckm-manager.h
+%{_includedir}/ckm/ckm/ckm-control.h
 %{_includedir}/ckm/ckm/ckm-error.h
 %{_includedir}/ckm/ckm/ckm-type.h
 %{_libdir}/pkgconfig/*.pc

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9623012..e03ca83 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -136,8 +136,8 @@ INSTALL(TARGETS ${TARGET_KEY_MANAGER} DESTINATION bin)
 
 
 INSTALL(FILES
-    ${KEY_MANAGER_SRC_PATH}/include/ckm/key-manager.h
-    ${KEY_MANAGER_SRC_PATH}/include/ckm/key-manager-control.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-manager.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-control.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-error.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-type.h
     DESTINATION /usr/include/ckm/ckm

diff --git a/src/include/ckm/key-manager-control.h b/src/include/ckm/ckm-control.h
similarity index 98%
rename from src/include/ckm/key-manager-control.h
rename to src/include/ckm/ckm-control.h
index 5491add..ad2a99e 100644 (file)
--- a/src/include/ckm/key-manager-control.h
+++ b/src/include/ckm/ckm-control.h
@@ -14,7 +14,7 @@
  *  limitations under the License
  *
  *
- * @file        key-manager.h
+ * @file        ckm-manager.h
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
  * @brief       Main header file for client library.

diff --git a/src/include/ckm/ckm-error.h b/src/include/ckm/ckm-error.h
index 34370b3..ea81e04 100644 (file)
--- a/src/include/ckm/ckm-error.h
+++ b/src/include/ckm/ckm-error.h
@@ -1,5 +1,5 @@
 /*
- *  key-manager
+ *  ckm-manager
  *
  *  Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
  *
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 
 /**
- * @file    key-manager.h
+ * @file    ckm-manager.h
  * @version 1.0
  * @brief   This file contains APIs of the Central Key Manager
 */
@@ -116,7 +116,7 @@ extern "C" {
 #endif
 
 /*
- * This function was created mainly for testing key-manager client/service
+ * This function was created mainly for testing ckm-manager client/service
  * proper behaviour. It sends a message and returns message from service,
  * which should be a pure echo.
  *

diff --git a/src/include/ckm/key-manager.h b/src/include/ckm/ckm-manager.h
similarity index 99%
rename from src/include/ckm/key-manager.h
rename to src/include/ckm/ckm-manager.h
index 5fb4947..4cedae2 100644 (file)
--- a/src/include/ckm/key-manager.h
+++ b/src/include/ckm/ckm-manager.h
@@ -14,7 +14,7 @@
  *  limitations under the License
  *
  *
- * @file        key-manager.h
+ * @file        ckm-manager.h
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
  * @brief       Main header file for client library.

diff --git a/src/manager/client/client-certificate.cpp b/src/manager/client/client-certificate.cpp
index 360fdb9..de5f4e0 100644 (file)
--- a/src/manager/client/client-certificate.cpp
+++ b/src/manager/client/client-certificate.cpp
@@ -19,7 +19,7 @@
  * @brief       Certificate class implementation.
  */
 
-#include <ckm/key-manager.h>
+#include <ckm/ckm-manager.h>
 
 #include <certificate-impl.h>
 

diff --git a/src/manager/client/client-control.cpp b/src/manager/client/client-control.cpp
index 393abac..1a352ff 100644 (file)
--- a/src/manager/client/client-control.cpp
+++ b/src/manager/client/client-control.cpp
@@ -24,7 +24,7 @@
 #include <message-buffer.h>
 #include <protocols.h>
 
-#include <ckm/key-manager-control.h>
+#include <ckm/ckm-control.h>
 
 namespace CKM {
 

diff --git a/src/manager/client/client-echo.cpp b/src/manager/client/client-echo.cpp
index 584ebaa..eef5d11 100644 (file)
--- a/src/manager/client/client-echo.cpp
+++ b/src/manager/client/client-echo.cpp
@@ -16,7 +16,7 @@
  * @file        client-echo.cpp
  * @author      Zofia Abramowska (z.abramowska@samsung.com)
  * @version     1.0
- * @brief       This file contains example of key-manager client implementation
+ * @brief       This file contains example of ckm-manager client implementation
  */
 
 #include <dpl/log/log.h>

diff --git a/src/manager/client/client-error.cpp b/src/manager/client/client-error.cpp
index a618b5e..12357f8 100644 (file)
--- a/src/manager/client/client-error.cpp
+++ b/src/manager/client/client-error.cpp
@@ -16,7 +16,7 @@
  * @file        client-error.cpp
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
- * @brief       This file contains example of key-manager client implementation
+ * @brief       This file contains example of ckm-manager client implementation
  */
 #include <ckm/ckm-error.h>
 

diff --git a/src/manager/client/client-key.cpp b/src/manager/client/client-key.cpp
index f760d7d..fe365cb 100644 (file)
--- a/src/manager/client/client-key.cpp
+++ b/src/manager/client/client-key.cpp
@@ -19,7 +19,7 @@
  * @brief       Key - api implementation.
  */
 #include <ckm/ckm-type.h>
-#include <ckm/key-manager.h>
+#include <ckm/ckm-manager.h>
 
 #include <dpl/log/log.h>
 

diff --git a/src/manager/client/client-manager-impl.h b/src/manager/client/client-manager-impl.h
index 92ccab1..af84bf8 100644 (file)
--- a/src/manager/client/client-manager-impl.h
+++ b/src/manager/client/client-manager-impl.h
@@ -23,7 +23,7 @@
 #include <protocols.h>
 
 #include <ckm/ckm-type.h>
-#include <ckm/key-manager.h>
+#include <ckm/ckm-manager.h>
 
 namespace CKM {
 

diff --git a/src/manager/client/client-manager.cpp b/src/manager/client/client-manager.cpp
index 9ec299e..8d6d176 100644 (file)
--- a/src/manager/client/client-manager.cpp
+++ b/src/manager/client/client-manager.cpp
@@ -18,7 +18,7 @@
  * @version     1.0
  * @brief       Client Manager implementation.
  */
-#include <ckm/key-manager.h>
+#include <ckm/ckm-manager.h>
 
 #include <client-manager-impl.h>
 

diff --git a/src/manager/common/protocols.cpp b/src/manager/common/protocols.cpp
index 558f07f..414b2fe 100644 (file)
--- a/src/manager/common/protocols.cpp
+++ b/src/manager/common/protocols.cpp
@@ -28,9 +28,9 @@
 
 namespace CKM {
 
-char const * const SERVICE_SOCKET_ECHO = "/tmp/.central-key-manager-echo.sock";
-char const * const SERVICE_SOCKET_CKM_CONTROL = "/tmp/.central-key-manager-api-control.sock";
-char const * const SERVICE_SOCKET_CKM_STORAGE = "/tmp/.central-key-manager-api-storage.sock";
+char const * const SERVICE_SOCKET_ECHO = "/tmp/.central-ckm-manager-echo.sock";
+char const * const SERVICE_SOCKET_CKM_CONTROL = "/tmp/.central-ckm-manager-api-control.sock";
+char const * const SERVICE_SOCKET_CKM_STORAGE = "/tmp/.central-ckm-manager-api-storage.sock";
 
 DBDataType toDBDataType(KeyType key) {
     switch(key) {

diff --git a/src/manager/common/smack-check.h b/src/manager/common/smack-check.h
index 7c9220c..942578b 100644 (file)
--- a/src/manager/common/smack-check.h
+++ b/src/manager/common/smack-check.h
@@ -1,5 +1,5 @@
 /*
- *  key-manager
+ *  ckm-manager
  *
  *  Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd All Rights Reserved
  *

diff --git a/src/manager/main/key-manager-main.cpp b/src/manager/main/key-manager-main.cpp
index e2e4859..1a14cc0 100644 (file)
--- a/src/manager/main/key-manager-main.cpp
+++ b/src/manager/main/key-manager-main.cpp
@@ -14,7 +14,7 @@
  *  limitations under the License
  */
 /*
- * @file        key-manager-main.cpp
+ * @file        ckm-manager-main.cpp
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
  * @brief       Implementation of central key manager

diff --git a/src/manager/main/key-manager-util.cpp b/src/manager/main/key-manager-util.cpp
index ed21b46..04f424d 100644 (file)
--- a/src/manager/main/key-manager-util.cpp
+++ b/src/manager/main/key-manager-util.cpp
@@ -1,5 +1,5 @@
 /*
- *  key-manager
+ *  ckm-manager
  *
  *  Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index 3c9d7bb..56a7c0c 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -21,8 +21,8 @@
  */
 #include <dpl/serialization.h>
 #include <dpl/log/log.h>
-#include <ckm/key-manager.h>
-#include <ckm/key-manager-control.h>
+#include <ckm/ckm-manager.h>
+#include <ckm/ckm-control.h>
 #include <ckm/ckm-error.h>
 #include <ckm/ckm-type.h>
 #include <key-provider.h>