Adjusted dbus interface names

6 files changed, 24 insertions, 80 deletions

diff --git a/ChangeLog b/ChangeLog
index 167f41a..05eaf57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,67 +1,2 @@
-Revision 0.3.2
-- Updated dbus interface (removed error code as paramaters; requestID passed by a message will now returned to "sender")
-- Moved headers used by other persistence components into include_protected folder
-
-Revision 0.3.1
-- Fixed a problem when accessing prct and key-value database
-- reverted change of datastructure mad in revision 0.2.4
-
-Revision 0.3.0
-- Switched to the MPL v2 license
-- Fixed dbus signal issues
-- Corrected dbus persistence admin interface parameters
-- Removed static code analysis warnings
-- Removed gvdb library, only Itzam/C will be used now.
-- Adjusted customer plugin interface (long to int datatype)
-- Adjusted file and key interface (long to int)
-
-
-Revision 0.2.4
-- Updated test data
-- Internal data reorganization
-- Fixed a problem with cursor (warning: still not fully working as expected)
-- Fixed a problem with internal database handling
-
-
-Revision 0.2.3
-- Fixed handle problem
-- added cursor functions
-- key do not need to start with a '/' anymore
-- added multi-threading support to dbus mainloop
-
-
-Revision 0.2.2
-- Updated test data
-- Added shared data support
-- Removed error when loading custom plugin function that is not available in the plugin library
-  (loading just continues with the next function and does not abort anymore)
-
-
-Revision 0.2.1
-- Extended tests
-- Fixed some minor bugs
-- Removed dconf
-
-
-Revision 0.2.0
-- Fixed a problem with handle generation
-- Updated custom plugin library interface
-- Switched to itzam database (gvdb currently commented out)
-- Adjusted dbus message parameter
-- Extended tests (added tests for "key_write_data")
-- Added itzam database files to Data.tar.gz files
-
-
-Revision 0.1.5
-- Fixed problem where no custom lib is available; extended custom lib interface; introduced error codes; removed modules form Makefile.am
-- Adjusted license in test files to MIT
-- Removed requesting dbus name from dbus main loop
-
-
-Revison 0.1.4
-- Update after code review; Extended custom library interface with function without handle
-- Removed c++test warnings
-- Moved test data to subfolder test
-- Update after code review; corrected package config; updated tests and test data 
-- Now custom client lib functions will be called; Added debug configure switch (debug was by default activated)
-- Added debug version to configure; Now custom client lib functions will be called; stabilized custom library feature; added new test data
+For changes see git repository hisotry: 
+http://git.projects.genivi.org/?p=persistence/persistence-client-library.git;a=summary
diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c
index 0ea4fad..fd24232 100644
--- a/src/persistence_client_library_dbus_service.c
+++ b/src/persistence_client_library_dbus_service.c
@@ -204,11 +204,12 @@ int setup_dbus_mainloop(void)
    pthread_t thread;
    DBusError err;
    const char *pAddress = getenv("PERS_CLIENT_DBUS_ADDRESS");
-   dbus_error_init(&err);
 
    // enable locking of data structures in the D-Bus library for multi threading.
    dbus_threads_init_default();
 
+   dbus_error_init(&err);
+
    // Connect to the bus and check for errors
    if(pAddress != NULL)
    {
diff --git a/src/persistence_client_library_lc_interface.c b/src/persistence_client_library_lc_interface.c
index 203a9e7..3783a5a 100644
--- a/src/persistence_client_library_lc_interface.c
+++ b/src/persistence_client_library_lc_interface.c
@@ -167,10 +167,10 @@ int send_lifecycle_register(const char* method, int shutdownMode)
    const char* objName = "/org/genivi/NodeStateManager/LifeCycleConsumer";
    const char* busName = dbus_bus_get_unique_name(conn);
 
-   DBusMessage* message = dbus_message_new_method_call("org.genivi.NodeStateManager.Consumer",  // destination
-                                                       "/org/genivi/NodeStateManager/Consumer",  // path
+   DBusMessage* message = dbus_message_new_method_call("org.genivi.NodeStateManager",           // destination
+                                                       "/org/genivi/NodeStateManager",          // path
                                                        "org.genivi.NodeStateManager.Consumer",  // interface
-                                                       method);                  // method
+                                                       method);                                 // method
    if(message != NULL)
    {
       dbus_message_append_args(message, DBUS_TYPE_STRING, &busName,
diff --git a/src/persistence_client_library_pas_interface.c b/src/persistence_client_library_pas_interface.c
index 43e18af..7d5292d 100644
--- a/src/persistence_client_library_pas_interface.c
+++ b/src/persistence_client_library_pas_interface.c
@@ -276,10 +276,10 @@ int send_pas_register(const char* method, int notificationFlag)
    const char* objName = "/org/genivi/persistence/adminconsumer";
    const char* busName = dbus_bus_get_unique_name(conn);
 
-   DBusMessage* message = dbus_message_new_method_call("org.genivi.persistence.admin",    // destination
-                                                      "/org/genivi/persistence/admin",    // path
-                                                       "org.genivi.persistence.admin",    // interface
-                                                       method);                  // method
+   DBusMessage* message = dbus_message_new_method_call("org.genivi.persistence",       // destination
+                                                      "/org/genivi/persistence",       // path
+                                                       "org.genivi.persistence.admin", // interface
+                                                       method);                        // method
 
    if(message != NULL)
    {
diff --git a/test/persistence_admin_service_mockup.c b/test/persistence_admin_service_mockup.c
index d34aed2..e8cf693 100644
--- a/test/persistence_admin_service_mockup.c
+++ b/test/persistence_admin_service_mockup.c
@@ -181,6 +181,10 @@ DBusHandlerResult checkPersAdminMsg(DBusConnection * connection, DBusMessage * m
          printf(" ==> org.genivi.persistence.admin - received U N KN O W N-'%s'\n", dbus_message_get_interface(message));
       }
    }
+   else
+   {
+      printf(" ==> org.genivi.persistence - received U N KN O W N-'%s'\n", dbus_message_get_interface(message));
+   }
    return result;
 }
 
@@ -306,7 +310,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtableFallback, v
          gPollInfo.fds[0].events = POLLIN;
 
          // register for messages
-         if (   (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/persistence/admin", &vtable, userData))
+         if (   (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/persistence", &vtable, userData))
              && (TRUE==dbus_connection_register_fallback(conn, "/", &vtableFallback, userData)) )
          {
             if (TRUE!=dbus_connection_set_watch_functions(conn, addWatch, removeWatch, watchToggled, NULL, NULL))
@@ -355,9 +359,9 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtableFallback, v
                                     switch (buf[0])
                                     {
                                     case CMD_REQUEST_NAME:
-                                       if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER !=dbus_bus_request_name(conn, "org.genivi.persistence.admin", DBUS_NAME_FLAG_DO_NOT_QUEUE, &err))
+                                       if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER !=dbus_bus_request_name(conn, "org.genivi.persistence", DBUS_NAME_FLAG_DO_NOT_QUEUE, &err))
                                        {
-                                          fprintf(stderr, "Cannot acquire name 'org.genivi.persistence.admin': \n    \"(%s)\". Bailing out!\n", err.message);
+                                          fprintf(stderr, "Cannot acquire name 'org.genivi.persistence': \n    \"(%s)\". Bailing out!\n", err.message);
                                           dbus_error_free(&err);
                                           bContinue = FALSE;
                                        }
diff --git a/test/persistence_lifeCycle_mockup.c b/test/persistence_lifeCycle_mockup.c
index c248de8..14a6ca3 100644
--- a/test/persistence_lifeCycle_mockup.c
+++ b/test/persistence_lifeCycle_mockup.c
@@ -181,6 +181,10 @@ DBusHandlerResult checkPersAdminMsg(DBusConnection * connection, DBusMessage * m
          printf(" ==> org.genivi.NodeStateManager.Consumer - received U N KN O W N-'%s'\n", dbus_message_get_interface(message));
       }
    }
+   else
+   {
+      printf(" ==> org.genivi.NodeStateManager - received U N KN O W N-'%s'\n", dbus_message_get_interface(message));
+   }
    return result;
 }
 
@@ -306,7 +310,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtableFallback, v
          gPollInfo.fds[0].events = POLLIN;
 
          // register for messages
-         if (   (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/NodeStateManager/Consumer", &vtable, userData))
+         if (   (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/NodeStateManager", &vtable, userData))
              && (TRUE==dbus_connection_register_fallback(conn, "/", &vtableFallback, userData)) )
          {
             if (TRUE!=dbus_connection_set_watch_functions(conn, addWatch, removeWatch, watchToggled, NULL, NULL))
@@ -355,7 +359,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtableFallback, v
                                     switch (buf[0])
                                     {
                                     case CMD_REQUEST_NAME:
-                                       if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER !=dbus_bus_request_name(conn, "org.genivi.NodeStateManager.Consumer", DBUS_NAME_FLAG_DO_NOT_QUEUE, &err))
+                                       if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER !=dbus_bus_request_name(conn, "org.genivi.NodeStateManager", DBUS_NAME_FLAG_DO_NOT_QUEUE, &err))
                                        {
                                           fprintf(stderr, "Cannot acquire name 'org.genivi.NodeStateManager.Consumer': \n    \"(%s)\". Bailing out!\n", err.message);
                                           dbus_error_free(&err);