1 files changed, 103 insertions, 20 deletions
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
index 3e3fdac..40578de 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* Used org.genivi.commonapi.core 3.1.2.v201507021046.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -56,7 +56,10 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
         ExtendedInterfaceStub,
         uint32_t
-        > ExtendedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u");
+        > ExtendedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
+            &ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute
+            , "u"
+            );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
         ExtendedInterfaceStub,
         uint32_t
@@ -69,11 +72,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
         ExtendedInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended
-        > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)");
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
+        > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
+            &ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute
+            , "(sqi)"
+            );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
         ExtendedInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > ExtendedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
                 &ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
@@ -83,11 +91,16 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
         ExtendedInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
-        > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute, "at");
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
+        > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
+            &ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute
+            , "at"
+            );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
         ExtendedInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > ExtendedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
                 &ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
@@ -97,58 +110,128 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
                 );
 #endif
 
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<uint32_t>,
+    std::tuple<>,
+    std::tuple<CommonAPI::EmptyDeployment>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testIntMethodExtendedStubDispatcher(&ExtendedInterfaceStub::TestIntMethodExtended, "", std::tuple<uint32_t>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testIntMethodExtendedStubDispatcher(
+    &ExtendedInterfaceStub::TestIntMethodExtended, "",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
+                	std::make_tuple());
 
 #ifdef WIN32
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<>,
+    std::tuple<>,
+    std::tuple<>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testEmptyMethodStubDispatcher(&ExtendedInterfaceStub::testEmptyMethod, "", std::tuple<>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testEmptyMethodStubDispatcher(
+    &ExtendedInterfaceStub::testEmptyMethod, "",
+					std::make_tuple(),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<uint32_t, std::string>,
+    std::tuple<>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testVoidPredefinedTypeMethodStubDispatcher(&ExtendedInterfaceStub::testVoidPredefinedTypeMethod, "", std::tuple<uint32_t, std::string>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testVoidPredefinedTypeMethodStubDispatcher(
+    &ExtendedInterfaceStub::testVoidPredefinedTypeMethod, "",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<uint32_t, std::string>,
-    std::tuple<uint32_t, std::string>
-    > ExtendedInterfaceDBusStubAdapterInternal::testPredefinedTypeMethodStubDispatcher(&ExtendedInterfaceStub::testPredefinedTypeMethod, "us", std::tuple<uint32_t, std::string, uint32_t, std::string>());
+    std::tuple<uint32_t, std::string>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
+    std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testPredefinedTypeMethodStubDispatcher(
+    &ExtendedInterfaceStub::testPredefinedTypeMethod, "us",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)),
+                	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)));
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
+    std::tuple<>,
+    std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testVoidDerivedTypeMethodStubDispatcher(&ExtendedInterfaceStub::testVoidDerivedTypeMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testVoidDerivedTypeMethodStubDispatcher(
+    &ExtendedInterfaceStub::testVoidDerivedTypeMethod, "",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
-    std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>
-    > ExtendedInterfaceDBusStubAdapterInternal::testDerivedTypeMethodStubDispatcher(&ExtendedInterfaceStub::testDerivedTypeMethod, "ia{ua(sq)}", std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>());
+    std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
+    std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
+    std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testDerivedTypeMethodStubDispatcher(
+    &ExtendedInterfaceStub::testDerivedTypeMethod, "ia{ua(sq)}",
+					std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)),
+                	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)));
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>,
+    std::tuple<>,
+    std::tuple<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testArrayOfPolymorphicStructMethodStubDispatcher(&ExtendedInterfaceStub::TestArrayOfPolymorphicStructMethod, "", std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testArrayOfPolymorphicStructMethodStubDispatcher(
+    &ExtendedInterfaceStub::TestArrayOfPolymorphicStructMethod, "",
+					std::make_tuple(static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>,
+    std::tuple<>,
+    std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testMapOfPolymorphicStructMethodStubDispatcher(&ExtendedInterfaceStub::TestMapOfPolymorphicStructMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testMapOfPolymorphicStructMethodStubDispatcher(
+    &ExtendedInterfaceStub::TestMapOfPolymorphicStructMethod, "",
+					std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>,
+    std::tuple<>,
+    std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testStructWithPolymorphicMemberMethodStubDispatcher(&ExtendedInterfaceStub::TestStructWithPolymorphicMemberMethod, "", std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testStructWithPolymorphicMemberMethodStubDispatcher(
+    &ExtendedInterfaceStub::TestStructWithPolymorphicMemberMethod, "",
+					std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr)),
+                	std::make_tuple());
+
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>,
+    std::tuple<>,
+    std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>,
     std::tuple<>
-    > ExtendedInterfaceDBusStubAdapterInternal::testStructWithEnumKeyMapMemberStubDispatcher(&ExtendedInterfaceStub::TestStructWithEnumKeyMapMember, "", std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>());
+    
+    > ExtendedInterfaceDBusStubAdapterInternal::testStructWithEnumKeyMapMemberStubDispatcher(
+    &ExtendedInterfaceStub::TestStructWithEnumKeyMapMember, "",
+					std::make_tuple(static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr)),
+                	std::make_tuple());
 #endif