CommonAPI-D-Bus-Tools 3.1.9

COVESA · Oct 11, 2016 · 4370d34 · 4370d34
1 parent 6701309
commit 4370d34
Show file tree

Hide file tree

Showing 45 changed files with 915 additions and 1,038 deletions.
diff --git a/CommonAPI-Examples/BlueZ/src/BlueZClient.cpp b/CommonAPI-Examples/BlueZ/src/BlueZClient.cpp
@@ -27,7 +27,7 @@ int main(int argc, const char * const argv[])
 
     std::cout << "Checking 'org.bluez.Manager' availability.." << std::endl;
     while (!mgrProxy->isAvailable()) {
-        usleep(10);
+        std::this_thread::sleep_for(std::chrono::microseconds(10));
     }
     std::cout << "\t..available." << std::endl;
 
@@ -76,7 +76,7 @@ int main(int argc, const char * const argv[])
         std::cout << "Checking 'org.bluez.Adapter' " << firstAdapter << " availability.." << std::endl;
 
         while (!adapterProxy->isAvailable()) {
-            usleep(10);
+            std::this_thread::sleep_for(std::chrono::microseconds(10));
         }
         std::cout << "\t..available." << std::endl;
 

diff --git a/CommonAPI-Examples/LegacyTest/src/LegacyTestClient.cpp b/CommonAPI-Examples/LegacyTest/src/LegacyTestClient.cpp
@@ -41,7 +41,7 @@ class LegacyTestClient: public ::testing::Test {
         myProxy = runtime->buildProxy < LegacyTestProxy > (domain, instance);
 
         while (!myProxy->isAvailable()) {
-            usleep(10);
+            std::this_thread::sleep_for(std::chrono::microseconds(10));
         }
         ASSERT_TRUE(myProxy->isAvailable());
 

diff --git a/CommonAPI-Examples/ObjectPathSimple/src/ObjectPathSimpleClient.cpp b/CommonAPI-Examples/ObjectPathSimple/src/ObjectPathSimpleClient.cpp
@@ -24,7 +24,7 @@ int main() {
     std::shared_ptr<ObjectPathSimpleProxyDefault> myProxy = runtime->buildProxy < ObjectPathSimpleProxy > (domain, instance);
 
     while (!myProxy->isAvailable()) {
-        usleep(10);
+        std::this_thread::sleep_for(std::chrono::microseconds(10));
     }
 
     // Subscribe to broadcast

diff --git a/CommonAPI-Examples/UDisks2/src/UDisks2Client.cpp b/CommonAPI-Examples/UDisks2/src/UDisks2Client.cpp
@@ -35,7 +35,7 @@ int main(const int argc,  const char * const argv[]) {
 
     std::cout << "Checking 'org.freedesktop.UDisks2' availability.." << std::endl;
     while (!rootProxy->isAvailable()) {
-        usleep(10);
+        std::this_thread::sleep_for(std::chrono::microseconds(10));
     }
     std::cout << "\t..available." << std::endl;
 

diff --git a/CommonAPI-Examples/VariantSimple/src/VariantSimpleClient.cpp b/CommonAPI-Examples/VariantSimple/src/VariantSimpleClient.cpp
@@ -53,7 +53,7 @@ int main(int argc, const char * const argv[])
 
     std::cout << "Checking availability!" << std::endl;
     while (!myProxy->isAvailable()) {
-        usleep(10);
+        std::this_thread::sleep_for(std::chrono::microseconds(10));
     }
     std::cout << "Available..." << std::endl;
 

diff --git a/org.genivi.commonapi.dbus.cli.feature/feature.xml b/org.genivi.commonapi.dbus.cli.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.cli.feature"
       label="CommonAPI D-Bus CLI Generator Feature"
-      version="3.1.8.qualifier"
+      version="3.1.9.qualifier"
       provider-name="BMW AG">
 
    <description url="http://www.example.com/description">

diff --git a/org.genivi.commonapi.dbus.cli.feature/pom.xml b/org.genivi.commonapi.dbus.cli.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product b/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="CommonAPI D-Bus Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.1.8" useFeatures="true" includeLaunchers="true">
+<product name="CommonAPI D-Bus Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.1.9" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/org.genivi.commonapi.dbus.cli.product/pom.xml b/org.genivi.commonapi.dbus.cli.product/pom.xml
@@ -131,7 +131,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: commonapi D-Bus generator Console Interface
 Bundle-SymbolicName: org.genivi.commonapi.dbus.cli;singleton:=true
-Bundle-Version: 3.1.8.qualifier
+Bundle-Version: 3.1.9.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.cli.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.genivi.commonapi.console,
- org.genivi.commonapi.dbus;bundle-version="3.1.8"
+ org.genivi.commonapi.dbus;bundle-version="3.1.9"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: BMW AG
diff --git a/org.genivi.commonapi.dbus.cli/pom.xml b/org.genivi.commonapi.dbus.cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.feature/feature.xml b/org.genivi.commonapi.dbus.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.feature"
       label="%featureName"
-      version="3.1.8.qualifier"
+      version="3.1.9.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.feature/pom.xml b/org.genivi.commonapi.dbus.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.releng/pom.xml b/org.genivi.commonapi.dbus.releng/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
     <repositories>

diff --git a/org.genivi.commonapi.dbus.target/pom.xml b/org.genivi.commonapi.dbus.target/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API DBus UI
 Bundle-SymbolicName: org.genivi.commonapi.dbus.ui;singleton:=true
-Bundle-Version: 3.1.8.qualifier
+Bundle-Version: 3.1.9.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.ui.CommonApiDBusUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  com.google.inject;bundle-version="3.0.0",
- org.genivi.commonapi.core.ui;bundle-version="3.1.8";visibility:=reexport,
- org.genivi.commonapi.dbus;bundle-version="3.1.8";visibility:=reexport,
+ org.genivi.commonapi.core.ui;bundle-version="3.1.9";visibility:=reexport,
+ org.genivi.commonapi.dbus;bundle-version="3.1.9";visibility:=reexport,
  org.franca.core.dsl.ui;bundle-version="0.9.1",
  org.franca.deploymodel.dsl.ui;bundle-version="0.9.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/org.genivi.commonapi.dbus.ui/pom.xml b/org.genivi.commonapi.dbus.ui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.updatesite/category.xml b/org.genivi.commonapi.dbus.updatesite/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.genivi.commonapi.core.validator.feature_3.1.8.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.1.8.qualifier">
+   <feature url="features/org.genivi.commonapi.core.validator.feature_3.1.9.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.1.9.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
-   <feature url="features/org.genivi.commonapi.dbus.feature_3.1.8.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.1.8.qualifier">
+   <feature url="features/org.genivi.commonapi.dbus.feature_3.1.9.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.1.9.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">

diff --git a/org.genivi.commonapi.dbus.updatesite/pom.xml b/org.genivi.commonapi.dbus.updatesite/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator.feature/feature.xml b/org.genivi.commonapi.dbus.validator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.validator.feature"
       label="%featureName"
-      version="3.1.8.qualifier"
+      version="3.1.9.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.validator.feature/pom.xml b/org.genivi.commonapi.dbus.validator.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commonapi DBus Validator
 Bundle-SymbolicName: org.genivi.commonapi.dbus.validator;singleton:=true
-Bundle-Version: 3.1.8.qualifier
+Bundle-Version: 3.1.9.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.1.8";visibility:=reexport,
- org.genivi.commonapi.dbus.ui;bundle-version="3.1.8";visibility:=reexport
+ org.genivi.commonapi.core;bundle-version="3.1.9";visibility:=reexport,
+ org.genivi.commonapi.dbus.ui;bundle-version="3.1.9";visibility:=reexport
 Export-Package: org.genivi.commonapi.dbus.validator
diff --git a/org.genivi.commonapi.dbus.validator/pom.xml b/org.genivi.commonapi.dbus.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.verification/CMakeLists.txt b/org.genivi.commonapi.dbus.verification/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(libdbusglue)
 
 SET( ${PROJECT_NAME}_MAJOR_VERSION 3 )
 SET( ${PROJECT_NAME}_MINOR_VERSION 1 )
-SET( ${PROJECT_NAME}_PATCH_LEVEL 8 )
+SET( ${PROJECT_NAME}_PATCH_LEVEL 9 )
 
 message("Project name: ${PROJECT_NAME}")
 
@@ -155,6 +155,7 @@ if (MSVC)
         "src-gen/v1/commonapi/communication/*.cpp"
         "src-gen/v1/commonapi/advanced/bselective/*.cpp"
         "src-gen/v1/commonapi/advanced/managed/*.cpp"
+        "src-gen/v1/commonapi/advanced/extended/*.cpp"
         "src-gen/v1/commonapi/advanced/polymorph/*.cpp"
         "src-gen/v1/commonapi/datatypes/primitive/*.cpp"
         "src-gen/v1/commonapi/datatypes/advanced/*.cpp"
@@ -171,6 +172,7 @@ else()
         "src-gen/v1/commonapi/communication/*DBus*.cpp"
         "src-gen/v1/commonapi/advanced/bselective/*DBus*.cpp"
         "src-gen/v1/commonapi/advanced/managed/*DBus*.cpp"
+        "src-gen/v1/commonapi/advanced/extended/*DBus*.cpp"
         "src-gen/v1/commonapi/advanced/polymorph/*DBus*.cpp"
         "src-gen/v1/commonapi/datatypes/primitive/*DBus*.cpp"
         "src-gen/v1/commonapi/datatypes/advanced/*DBus*.cpp"

diff --git a/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API D-Bus C++ Generator
 Bundle-Vendor: BMW AG
-Bundle-Version: 3.1.8.qualifier
+Bundle-Version: 3.1.9.qualifier
 Bundle-SymbolicName: org.genivi.commonapi.dbus;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.util;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.1.8";visibility:=reexport,
+ org.genivi.commonapi.core;bundle-version="3.1.9";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.genivi.commonapi.dbus.generator,

diff --git a/org.genivi.commonapi.dbus/pom.xml b/org.genivi.commonapi.dbus/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.9-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/...napi.dbus/src/org/genivi/commonapi/dbus/generator/FInterfaceDBusDeploymentGenerator.xtend b/...napi.dbus/src/org/genivi/commonapi/dbus/generator/FInterfaceDBusDeploymentGenerator.xtend
@@ -160,27 +160,27 @@ class FInterfaceDBusDeploymentGenerator extends FTypeCollectionDBusDeploymentGen
     '''
 
     def protected dispatch String generateDeploymentDeclaration(FAttribute _attribute, FInterface _interface, PropertyAccessor _accessor) {
-        if (_accessor.hasSpecificDeployment(_attribute)) {
-            return "extern " + _attribute.getDeploymentType(null, true) + " " + _attribute.name + "Deployment;"
+        if (_accessor.hasSpecificDeployment(_attribute) || (_attribute.array && _accessor.hasDeployment(_attribute))) {
+            return "extern " + _attribute.getDeploymentType(_interface, true) + " " + _attribute.name + "Deployment;"
         }
         return ""
     }
 
     def protected String generateDeploymentDeclaration(FArgument _argument, FMethod _method, FInterface _interface, PropertyAccessor _accessor) {
-        if (_accessor.hasSpecificDeployment(_argument)) {
-            return "extern " + _argument.getDeploymentType(null, true) + " " + _method.name + "_" + _argument.name + "Deployment;"
+        if (_accessor.hasSpecificDeployment(_argument) || (_argument.array && _accessor.hasDeployment(_argument))) {
+            return "extern " + _argument.getDeploymentType(_interface, true) + " " + _method.name + "_" + _argument.name + "Deployment;"
         }
     }
 
     def protected String generateDeploymentDeclaration(FArgument _argument, FBroadcast _broadcast, FInterface _interface, PropertyAccessor _accessor) {
-        if (_accessor.hasSpecificDeployment(_argument)) {
-            return "extern " + _argument.getDeploymentType(null, true) + " " + _broadcast.name + "_" + _argument.name + "Deployment;"
+        if (_accessor.hasSpecificDeployment(_argument) || (_argument.array && _accessor.hasDeployment(_argument))) {
+            return "extern " + _argument.getDeploymentType(_interface, true) + " " + _broadcast.name + "_" + _argument.name + "Deployment;"
         }
     }
 
     def protected dispatch String generateDeploymentDefinition(FAttribute _attribute, FInterface _interface, PropertyAccessor _accessor) {
-        if (_accessor.hasSpecificDeployment(_attribute)) {
-            var String definition = _attribute.getDeploymentType(null, true) + " " + _attribute.name + "Deployment("
+        if (_accessor.hasSpecificDeployment(_attribute) || (_attribute.array && _accessor.hasDeployment(_attribute))) {
+            var String definition = _attribute.getDeploymentType(_interface, true) + " " + _attribute.name + "Deployment("
             definition += _attribute.getDeploymentParameter(_attribute, _accessor)
             definition += ");"
             return definition
@@ -189,17 +189,17 @@ class FInterfaceDBusDeploymentGenerator extends FTypeCollectionDBusDeploymentGen
     }
 
     def protected String generateDeploymentDefinition(FArgument _argument, FMethod _method, FInterface _interface, PropertyAccessor _accessor) {
-        if (_accessor.hasSpecificDeployment(_argument)) {
-            var String definition = _argument.getDeploymentType(null, true) + " " + _method.name + "_" + _argument.name + "Deployment("
+        if (_accessor.hasSpecificDeployment(_argument) || (_argument.array && _accessor.hasDeployment(_argument))) {
+            var String definition = _argument.getDeploymentType(_interface, true) + " " + _method.name + "_" + _argument.name + "Deployment("
             definition += _argument.getDeploymentParameter(_argument, _accessor)
             definition += ");"
             return definition
         }
     }
 
     def protected String generateDeploymentDefinition(FArgument _argument, FBroadcast _broadcast, FInterface _interface, PropertyAccessor _accessor) {
-        if (_accessor.hasSpecificDeployment(_argument)) {
-            var String definition = _argument.getDeploymentType(null, true) + " " + _broadcast.name + "_" + _argument.name + "Deployment("
+        if (_accessor.hasSpecificDeployment(_argument) || (_argument.array && _accessor.hasDeployment(_argument))) {
+            var String definition = _argument.getDeploymentType(_interface, true) + " " + _broadcast.name + "_" + _argument.name + "Deployment("
             definition += _argument.getDeploymentParameter(_argument, _accessor)
             definition += ");"
             return definition

diff --git a/...commonapi.dbus/src/org/genivi/commonapi/dbus/generator/FInterfaceDBusProxyGenerator.xtend b/...commonapi.dbus/src/org/genivi/commonapi/dbus/generator/FInterfaceDBusProxyGenerator.xtend
@@ -224,7 +224,7 @@ class FInterfaceDBusProxyGenerator {
                  «val PropertyAccessor providerAccessor = new PropertyAccessor(new FDeployedProvider(p))»
                  «FOR i : p.instances.filter[target == fInterface]»
                      CommonAPI::DBus::DBusAddressTranslator::get()->insert(
-                         "local:«fInterface.fullyQualifiedName»:«providerAccessor.getInstanceId(i)»",
+                         "local:«fInterface.fullyQualifiedNameWithVersion»:«providerAccessor.getInstanceId(i)»",
                          "«providerAccessor.getDBusServiceName(i)»",
                          "«providerAccessor.getDBusObjectPath(i)»",
                          "«providerAccessor.getDBusInterfaceName(i)»");
@@ -252,7 +252,7 @@ class FInterfaceDBusProxyGenerator {
             getDeployments(fInterface, deploymentAccessor)»)
                 «ENDFOR»
                 «FOR managed : fInterface.managedInterfaces BEFORE ',' SEPARATOR ','»
-                    «managed.proxyManagerMemberName»(*this, "«managed.fullyQualifiedName»")
+                    «managed.proxyManagerMemberName»(*this, "«managed.fullyQualifiedName».«managed.interfaceVersion»","«managed.fullyQualifiedNameWithVersion»")
                 «ENDFOR»
         {
             «FOR p : providers»
@@ -426,7 +426,7 @@ class FInterfaceDBusProxyGenerator {
         var ret = fAttribute.dbusClassVariableName + '(*this'
 
         if (deploymentAccessor.getPropertiesType(fInterface) == PropertyAccessor.PropertiesType.freedesktop) {
-            ret = ret + ', getAddress().getInterface(), "' + fAttribute.elementName + '"'
+            ret = ret + ', getDBusAddress().getInterface(), "' + fAttribute.elementName + '"'
         } else {
 
             if (fAttribute.isObservable)