align the DBus signature of xml files with the one defined into Franca

13 files changed, 36 insertions, 34 deletions

diff --git a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
index fc09163..1b18bd6 100644
--- a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
@@ -36,4 +36,4 @@ set(genivi_mapviewer_configuration_LIBS ${PLUGIN_LDFLAGS})
 set(genivi_mapviewer_configuration_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_mapviewer_configuration genivi_mapviewer_configuration.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-configuration_adaptor.h)
-
+add_dependencies(genivi_mapviewer_configuration ${API_DIR}/map-viewer)
diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
index b3c74a8..9a426db 100644
--- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
@@ -122,7 +122,7 @@ country_2_to_3(const char *in)
 std::map< int32_t, int32_t > m_unitsOfMeasurement;
 
 class  Configuration
-: public org::genivi::mapviewer::Configuration_adaptor,
+: public org::genivi::navigation::mapviewer::Configuration_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -272,7 +272,7 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.mapviewer.Configuration");
+    conn->request_name("org.genivi.navigation.mapviewer.Configuration");
     m_unitsOfMeasurement[GENIVI_MAPVIEWER_LENGTH]=GENIVI_MAPVIEWER_KM;
 	server=new Configuration(*conn);
 }
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
index b7dbaca..2b83ce0 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
@@ -50,4 +50,5 @@ include_directories(${DBUS_GENERATED_INCLUDE_DIR}/navigation-core)
 set(genivi_mapviewer_mapviewercontrol_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_mapviewer_mapviewercontrol genivi_mapviewer_mapviewercontrol.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-mapviewercontrol_adaptor.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-routing_proxy.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-session_proxy.h ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-mapmatchedposition_proxy.h)
+add_dependencies(genivi_mapviewer_mapviewercontrol ${API_DIR}/map-viewer)
 
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index b1c2f76..a591cfb 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -175,13 +175,13 @@ static std::map<uint32_t, MapViewerControlObj *> handles;
 
 
 class Routing
-: public org::genivi::navigationcore::Routing_proxy,
+: public org::genivi::navigation::navigationcore::Routing_proxy,
   public DBus::ObjectProxy
 {
 	public:
 	MapViewerControlObj *m_mapviewerobj;
 	Routing(DBus::Connection &connection, MapViewerControlObj *obj)
-	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.Routing")
+	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Routing")
 	{
 		m_mapviewerobj=obj;
 	}
@@ -231,12 +231,12 @@ class Routing
 };
 
 class  NavigationCoreSession
-: public org::genivi::navigationcore::Session_proxy,
+: public org::genivi::navigation::navigationcore::Session_proxy,
   public DBus::ObjectProxy
 {
 	public:
 	NavigationCoreSession(DBus::Connection &connection)
-	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.Session")
+	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Session")
 	{
 	}
     void SessionDeleted(const uint32_t& sessionHandle)
@@ -247,14 +247,14 @@ class  NavigationCoreSession
 static void position_update(MapMatchedPosition *pos, struct vehicle *v);
 
 class  MapMatchedPosition
-: public org::genivi::navigationcore::MapMatchedPosition_proxy,
+: public org::genivi::navigation::navigationcore::MapMatchedPosition_proxy,
   public DBus::ObjectProxy
 {
 	public:
 	struct callback *cb;
 	MapViewerControlObj *m_mapviewerobj;
 	MapMatchedPosition(DBus::Connection &connection, struct vehicle *v)
-	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition")
+	: DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.MapMatchedPosition")
 	{	
 		cb=callback_new_2(callback_cast(position_update), this, v);
 	}
@@ -331,7 +331,7 @@ position_update(MapMatchedPosition *pos, struct vehicle *v)
 }
 
 class  MapViewerControl
-: public org::genivi::mapviewer::MapViewerControl_adaptor,
+: public org::genivi::navigation::mapviewer::MapViewerControl_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -1779,7 +1779,7 @@ plugin_init(void)
 		conns[i] = new DBus::Connection(DBus::Connection::SessionBus());
 		conns[i]->setup(&dispatchers[i]);
 	}
-    conns[MAPVIEWER_CONTROL_CONNECTION]->request_name("org.genivi.mapviewer.MapViewerControl");
+    conns[MAPVIEWER_CONTROL_CONNECTION]->request_name("org.genivi.navigation.mapviewer.MapViewerControl");
     server=new MapViewerControl(*conns[MAPVIEWER_CONTROL_CONNECTION]);
 
 #if LM
diff --git a/src/navigation/map-viewer/session-plugin/CMakeLists.txt b/src/navigation/map-viewer/session-plugin/CMakeLists.txt
index dd1a7de..d191822 100644
--- a/src/navigation/map-viewer/session-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/session-plugin/CMakeLists.txt
@@ -36,4 +36,5 @@ set(genivi_mapviewer_session_LIBS ${PLUGIN_LDFLAGS})
 set(genivi_mapviewer_session_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_mapviewer_session genivi_mapviewer_session.cxx ${DBUS_GENERATED_INCLUDE_DIR}/map-viewer/genivi-mapviewer-session_adaptor.h)
+add_dependencies(genivi_mapviewer_session ${API_DIR}/map-viewer)
 
diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
index 2c3bd97..832bc72 100644
--- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
+++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
@@ -47,7 +47,7 @@ static DBus::Connection *conn;
 static std::map<uint32_t, std::string *> handles;
 
 class  Session
-: public org::genivi::mapviewer::Session_adaptor,
+: public org::genivi::navigation::mapviewer::Session_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -75,7 +75,7 @@ class  Session
         while (handles[sessionHandle]) {
             sessionHandle++;
             if (sessionHandle == 256)
-				throw DBus::Error("org.genivi.mapviewer.Session.Error.NoMoreSessionHandles","Out of session handles");
+				throw DBus::Error("org.genivi.navigation.mapviewer.Session.Error.NoMoreSessionHandles","Out of session handles");
 		}
         handles[sessionHandle]=new std::string(client);
         error=0; //not implemented yet
@@ -93,7 +93,7 @@ class  Session
 	{
 		dbg(lvl_debug,"enter\n");
 		if (!handles[SessionHandle])
-			throw DBus::Error("org.genivi.mapviewer.Session.Error.NotAvailableSessionHandle","Session handle invalid");
+			throw DBus::Error("org.genivi.navigation.mapviewer.Session.Error.NotAvailableSessionHandle","Session handle invalid");
 		delete(handles[SessionHandle]);
 		handles[SessionHandle]=NULL;
 		SessionDeleted(SessionHandle);
@@ -128,6 +128,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.mapviewer.Session");
+	conn->request_name("org.genivi.navigation.mapviewer.Session");
 	server=new Session(*conn);
 }
diff --git a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
index b2a665b..1c5418f 100644
--- a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
@@ -124,7 +124,7 @@ country_2_to_3(const char *in)
 std::map< int32_t, int32_t > m_unitsOfMeasurement;
 
 class  Configuration
-: public org::genivi::navigationcore::Configuration_adaptor,
+: public org::genivi::navigation::navigationcore::Configuration_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -287,7 +287,7 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Configuration");
+    conn->request_name("org.genivi.navigation.navigationcore.Configuration");
     m_unitsOfMeasurement[GENIVI_NAVIGATIONCORE_LENGTH]=GENIVI_NAVIGATIONCORE_KM;
 	server=new Configuration(*conn);
 }
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 4e2183f..30c7f0f 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -69,7 +69,7 @@ class SpeechOutput
     SpeechOutput(DBus::Connection &connection)
         : DBus::ObjectProxy(connection,
                                     "/org/genivi/hmi/speechservice/SpeechOutput",
-                                    "org.genivi.hmi.speechservice.SpeechOutput")
+                                    "org.genivi.navigation.hmi.speechservice.SpeechOutput")
     {
     }
 
@@ -202,7 +202,7 @@ variant_enumeration(DBusCommonAPIEnumeration i)
 }
 
 class  Guidance
-: public org::genivi::navigationcore::Guidance_adaptor,
+: public org::genivi::navigation::navigationcore::Guidance_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -855,6 +855,6 @@ plugin_init(void)
 	// FIXME: What dbus address to use? 
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Guidance");
+	conn->request_name("org.genivi.navigation.navigationcore.Guidance");
 	server=new Guidance(*conn);
 }
diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
index 82b5aab..4aead3d 100644
--- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
@@ -90,7 +90,7 @@ static std::map<uint32_t, LocationInputObj *> handles;
 
 
 class  LocationInput
-: public org::genivi::navigationcore::LocationInput_adaptor,
+: public org::genivi::navigation::navigationcore::LocationInput_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -541,6 +541,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.LocationInput");
+	conn->request_name("org.genivi.navigation.navigationcore.LocationInput");
 	server=new LocationInput(*conn);
 }
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index 72737b2..76c97c7 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -122,7 +122,7 @@ variant_string(std::string s)
 
 
 class  MapMatchedPosition
-: public org::genivi::navigationcore::MapMatchedPosition_adaptor,
+: public org::genivi::navigation::navigationcore::MapMatchedPosition_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -369,7 +369,7 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.MapMatchedPosition");
+	conn->request_name("org.genivi.navigation.navigationcore.MapMatchedPosition");
 	server=new MapMatchedPosition(*conn);
 	config_cb.type=attr_callback;
 	config_cb.u.callback=callback_new_attr_0(callback_cast(config_attr_navit), attr_navit);
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index c54ac99..b2ea8b4 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -129,7 +129,7 @@ static struct command_table commands[] = {
 
 
 class  Routing
-: public org::genivi::navigationcore::Routing_adaptor,
+: public org::genivi::navigation::navigationcore::Routing_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -939,6 +939,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Routing");
+	conn->request_name("org.genivi.navigation.navigationcore.Routing");
 	server=new Routing(*conn);
 }
diff --git a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
index 60e761e..661ff88 100644
--- a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
+++ b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
@@ -47,7 +47,7 @@ static DBus::Connection *conn;
 static std::map<uint32_t, std::string *> handles;
 
 class  Session
-: public org::genivi::navigationcore::Session_adaptor,
+: public org::genivi::navigation::navigationcore::Session_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -75,7 +75,7 @@ class  Session
         while (handles[sessionHandle]) {
             sessionHandle++;
             if (sessionHandle == 256)
-				throw DBus::Error("org.genivi.navigationcore.Session.Error.NoMoreSessionHandles","Out of session handles");
+				throw DBus::Error("org.genivi.navigation.navigationcore.Session.Error.NoMoreSessionHandles","Out of session handles");
 		}
         handles[sessionHandle]=new std::string(client);
         error=0; //not implemented yet
@@ -93,7 +93,7 @@ class  Session
 	{
 		dbg(lvl_debug,"enter\n");
 		if (!handles[SessionHandle])
-			throw DBus::Error("org.genivi.navigationcore.Session.Error.NotAvailableSessionHandle","Session handle invalid");
+			throw DBus::Error("org.genivi.navigation.navigationcore.Session.Error.NotAvailableSessionHandle","Session handle invalid");
 		delete(handles[SessionHandle]);
 		handles[SessionHandle]=NULL;
 		SessionDeleted(SessionHandle);
@@ -130,6 +130,6 @@ plugin_init(void)
 	DBus::default_dispatcher = &dispatcher;
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
-	conn->request_name("org.genivi.navigationcore.Session");
+	conn->request_name("org.genivi.navigation.navigationcore.Session");
 	server=new Session(*conn);
 }
diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
index b6e3364..77e071e 100644
--- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
@@ -61,7 +61,7 @@ enum {
 
 static DBus::Glib::BusDispatcher dispatchers[CONNECTION_AMOUNT];
 static DBus::Connection *conns[CONNECTION_AMOUNT];
-static const char *cam_name="org.genivi.poiservice.POIContentAccessModuleNavit";
+static const char *cam_name="org.genivi.navigation.poiservice.POIContentAccessModuleNavit";
 
 static DBus::Variant
 variant_string(std::string s)
@@ -80,20 +80,20 @@ do_sort_distance(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct
 
 
 class PoiContentAccess
-: public org::genivi::poiservice::POIContentAccess_proxy,
+: public org::genivi::navigation::poiservice::POIContentAccess_proxy,
   public DBus::ObjectProxy
 {
 	public:
 
         PoiContentAccess(DBus::Connection &connection)
-        : DBus::ObjectProxy(connection, "/org/genivi/poiservice/POIContentAccess","org.genivi.poiservice.POIContentAccess")
+        : DBus::ObjectProxy(connection, "/org/genivi/poiservice/POIContentAccess","org.genivi.navigation.poiservice.POIContentAccess")
         {
         }
 
 };
 
 class ContentAccessModule
-: public org::genivi::poiservice::POIContentAccessModule_adaptor,
+: public org::genivi::navigation::poiservice::POIContentAccessModule_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {