* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1

Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>

10 files changed, 222 insertions, 261 deletions

diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
index 613cfdb..eb103e5 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -31,6 +20,7 @@ There are two rules that have to be kept in mind
 
 
 
+
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
@@ -72,7 +62,7 @@ namespace CommonAPI {
 
 namespace std {
     //hashes for types
-    
+
     //hashes for error types
 }
 
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
index 7b0969d..e147744 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -46,7 +35,7 @@ __attribute__((constructor)) void registerCommandControlDBusProxy(void) {
     CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(CommandControl::getInterfaceId(),
        &createCommandControlDBusProxy);
 }
-
+ 
 CommandControlDBusProxy::CommandControlDBusProxy(
                     const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
                     const std::string& commonApiAddress,
@@ -163,7 +152,7 @@ void CommandControlDBusProxy::connect(const am_sourceID_t& sourceID, const am_si
         *this,
         "connect",
         "qq",
-        sourceID, sinkID, 
+        sourceID, sinkID,
         callStatus
         , mainConnectionID, error);
 }
@@ -187,7 +176,7 @@ void CommandControlDBusProxy::disconnect(const am_mainConnectionID_t& mainConnec
         *this,
         "disconnect",
         "q",
-        mainConnectionID, 
+        mainConnectionID,
         callStatus
         , error);
 }
@@ -211,7 +200,7 @@ void CommandControlDBusProxy::setVolume(const am_sinkID_t& sinkID, const am_main
         *this,
         "setVolume",
         "qn",
-        sinkID, volume, 
+        sinkID, volume,
         callStatus
         , error);
 }
@@ -236,7 +225,7 @@ void CommandControlDBusProxy::volumeStep(const am_sinkID_t& sinkID, const int16_
         *this,
         "volumeStep",
         "qn",
-        sinkID, volumeStep_, 
+        sinkID, volumeStep_,
         callStatus
         , error);
 }
@@ -260,7 +249,7 @@ void CommandControlDBusProxy::setSinkMuteState(const am_sinkID_t& sinkID, const
         *this,
         "setSinkMuteState",
         "qi",
-        sinkID, muteState, 
+        sinkID, muteState,
         callStatus
         , error);
 }
@@ -286,7 +275,7 @@ void CommandControlDBusProxy::setMainSinkSoundProperty(const am_sinkID_t& sinkID
         *this,
         "setMainSinkSoundProperty",
         "q(qn)",
-        sinkID, soundProperty, 
+        sinkID, soundProperty,
         callStatus
         , error);
 }
@@ -312,7 +301,7 @@ void CommandControlDBusProxy::setMainSourceSoundProperty(const am_sourceID_t& so
         *this,
         "setMainSourceSoundProperty",
         "q(qn)",
-        sourceID, soundProperty, 
+        sourceID, soundProperty,
         callStatus
         , error);
 }
@@ -336,7 +325,7 @@ void CommandControlDBusProxy::setSystemProperty(const am_SystemProperty_s& prope
         *this,
         "setSystemProperty",
         "(qn)",
-        property, 
+        property,
         callStatus
         , error);
 }
@@ -427,7 +416,7 @@ void CommandControlDBusProxy::getListMainSinkSoundProperties(const am_sinkID_t&
         *this,
         "getListMainSinkSoundProperties",
         "q",
-        sinkID, 
+        sinkID,
         callStatus
         , listSoundProperties, error);
 }
@@ -451,7 +440,7 @@ void CommandControlDBusProxy::getListMainSourceSoundProperties(const am_sourceID
         *this,
         "getListMainSourceSoundProperties",
         "q",
-        sourceID, 
+        sourceID,
         callStatus
         , listSourceProperties, error);
 }
@@ -542,7 +531,7 @@ void CommandControlDBusProxy::getTimingInformation(const am_mainConnectionID_t&
         *this,
         "getTimingInformation",
         "q",
-        mainConnectionID, 
+        mainConnectionID,
         callStatus
         , delay, error);
 }
@@ -565,7 +554,7 @@ void CommandControlDBusProxy::getListMainSinkNotificationConfigurations(const am
         *this,
         "getListMainSinkNotificationConfigurations",
         "q",
-        sinkID, 
+        sinkID,
         callStatus
         , listMainNotificationConfigurations, error);
 }
@@ -588,7 +577,7 @@ void CommandControlDBusProxy::getListMainSourceNotificationConfigurations(const
         *this,
         "getListMainSourceNotificationConfigurations",
         "q",
-        sourceID, 
+        sourceID,
         callStatus
         , listMainNotificationConfigurations, error);
 }
@@ -613,7 +602,7 @@ void CommandControlDBusProxy::setMainSinkNotificationConfiguration(const am_sink
         *this,
         "setMainSinkNotificationConfiguration",
         "q(qin)",
-        sinkID, mainNotificationConfiguration, 
+        sinkID, mainNotificationConfiguration,
         callStatus
         , error);
 }
@@ -638,7 +627,7 @@ void CommandControlDBusProxy::setMainSourceNotificationConfiguration(const am_so
         *this,
         "setMainSourceNotificationConfiguration",
         "q(qin)",
-        sourceID, mainNotificationConfiguration, 
+        sourceID, mainNotificationConfiguration,
         callStatus
         , error);
 }
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
index e75bc5b..64091a7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -238,7 +227,7 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p
      */
     virtual void setMainSourceNotificationConfiguration(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration, CommonAPI::CallStatus& callStatus, am_Error_e& error);
     virtual std::future<CommonAPI::CallStatus> setMainSourceNotificationConfigurationAsync(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration, SetMainSourceNotificationConfigurationAsyncCallback callback);
-    
+
 
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
@@ -267,7 +256,7 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p
     CommonAPI::DBus::DBusEvent<SourceNotificationEvent> sourceNotification_;
     CommonAPI::DBus::DBusEvent<MainSinkNotificationConfigurationChangedEvent> mainSinkNotificationConfigurationChanged_;
     CommonAPI::DBus::DBusEvent<MainSourceNotificationConfigurationChangedEvent> mainSourceNotificationConfigurationChanged_;
-    
+
 };
 
 
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
index 16e1d4d..db01c28 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 #include "CommandControlDBusStubAdapter.h"
 #include <org/genivi/am/CommandControl.h>
@@ -41,31 +30,21 @@ __attribute__((constructor)) void registerCommandControlDBusStubAdapter(void) {
                                                                &createCommandControlDBusStubAdapter);
 }
 
-CommandControlDBusStubAdapter::CommandControlDBusStubAdapter(
-        const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
-        const std::string& commonApiAddress,
-        const std::string& dbusInterfaceName,
-        const std::string& dbusBusName,
-        const std::string& dbusObjectPath,
-        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
-        const std::shared_ptr<CommonAPI::StubBase>& stub):
-        CommandControlDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, 
-            dbusConnection, std::dynamic_pointer_cast<CommandControlStub>(stub),
-            NULL)
-            {
-}
 
-CommandControlDBusStubAdapter::~CommandControlDBusStubAdapter() {
+
+CommandControlDBusStubAdapterInternal::~CommandControlDBusStubAdapterInternal() {
     deactivateManagedInstances();
-    deinit();
-    stub_.reset();
+    CommandControlDBusStubAdapterHelper::deinit();
 }
 
-void CommandControlDBusStubAdapter::deactivateManagedInstances() {
+void CommandControlDBusStubAdapterInternal::deactivateManagedInstances() {
 }
 
-const char* CommandControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
-    static const char* introspectionData =
+const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+    static const std::string introspectionData =
+        "<method name=\"getInterfaceVersion\">\n"
+            "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+        "</method>\n"
         /**
          * Callback that is called when the number of connections change
          */
@@ -428,10 +407,15 @@ const char* CommandControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData()
             "<arg name=\"mainNotificationConfiguration\" type=\"(qin)\" direction=\"in\" />\n"
             "<arg name=\"error\" type=\"i\" direction=\"out\" />\n"
         "</method>\n"
+
     ;
-    return introspectionData;
+    return introspectionData.c_str();
 }
 
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        CommandControlStub,
+        CommonAPI::Version
+        > getCommandControlInterfaceVersionStubDispatcher(&CommandControlStub::getInterfaceVersion, "uu");
 
 
 /**
@@ -656,7 +640,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 /**
  * Callback that is called when the number of connections change
  */
-void CommandControlDBusStubAdapter::fireNewMainConnectionEvent(const am_MainConnectionType_s& mainConnection) {
+void CommandControlDBusStubAdapterInternal::fireNewMainConnectionEvent(const am_MainConnectionType_s& mainConnection) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_MainConnectionType_s>>
             ::sendSignal(
                 *this,
@@ -668,7 +652,7 @@ void CommandControlDBusStubAdapter::fireNewMainConnectionEvent(const am_MainConn
 /**
  * Callback that is called when the number of connections change
  */
-void CommandControlDBusStubAdapter::fireRemovedMainConnectionEvent(const am_mainConnectionID_t& mainConnection) {
+void CommandControlDBusStubAdapterInternal::fireRemovedMainConnectionEvent(const am_mainConnectionID_t& mainConnection) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_mainConnectionID_t>>
             ::sendSignal(
                 *this,
@@ -680,7 +664,7 @@ void CommandControlDBusStubAdapter::fireRemovedMainConnectionEvent(const am_main
 /**
  * Callback that is called when the number of sinks change
  */
-void CommandControlDBusStubAdapter::fireNewSinkEvent(const am_SinkType_s& sink) {
+void CommandControlDBusStubAdapterInternal::fireNewSinkEvent(const am_SinkType_s& sink) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_SinkType_s>>
             ::sendSignal(
                 *this,
@@ -692,7 +676,7 @@ void CommandControlDBusStubAdapter::fireNewSinkEvent(const am_SinkType_s& sink)
 /**
  * Callback that is called when the number of sinks change
  */
-void CommandControlDBusStubAdapter::fireRemovedSinkEvent(const am_sinkID_t& sinkID) {
+void CommandControlDBusStubAdapterInternal::fireRemovedSinkEvent(const am_sinkID_t& sinkID) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t>>
             ::sendSignal(
                 *this,
@@ -704,7 +688,7 @@ void CommandControlDBusStubAdapter::fireRemovedSinkEvent(const am_sinkID_t& sink
 /**
  * Callback that is called when the number of sources change
  */
-void CommandControlDBusStubAdapter::fireNewSourceEvent(const am_SourceType_s& source) {
+void CommandControlDBusStubAdapterInternal::fireNewSourceEvent(const am_SourceType_s& source) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_SourceType_s>>
             ::sendSignal(
                 *this,
@@ -716,7 +700,7 @@ void CommandControlDBusStubAdapter::fireNewSourceEvent(const am_SourceType_s& so
 /**
  * Callback that is called when the number of sources change
  */
-void CommandControlDBusStubAdapter::fireRemovedSourceEvent(const am_sourceID_t& source) {
+void CommandControlDBusStubAdapterInternal::fireRemovedSourceEvent(const am_sourceID_t& source) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t>>
             ::sendSignal(
                 *this,
@@ -728,7 +712,7 @@ void CommandControlDBusStubAdapter::fireRemovedSourceEvent(const am_sourceID_t&
 /**
  * this callback is fired if the number of sink classes changed
  */
-void CommandControlDBusStubAdapter::fireNumberOfSinkClassesChangedEvent() {
+void CommandControlDBusStubAdapterInternal::fireNumberOfSinkClassesChangedEvent() {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<>>
             ::sendSignal(
                 *this,
@@ -739,7 +723,7 @@ void CommandControlDBusStubAdapter::fireNumberOfSinkClassesChangedEvent() {
 /**
  * this callback is fired if the number of source classes changed
  */
-void CommandControlDBusStubAdapter::fireNumberOfSourceClassesChangedEvent() {
+void CommandControlDBusStubAdapterInternal::fireNumberOfSourceClassesChangedEvent() {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<>>
             ::sendSignal(
                 *this,
@@ -750,7 +734,7 @@ void CommandControlDBusStubAdapter::fireNumberOfSourceClassesChangedEvent() {
 /**
  * This callback is called when the ConnectionState of a connection changed.
  */
-void CommandControlDBusStubAdapter::fireMainConnectionStateChangedEvent(const am_mainConnectionID_t& connectionID, const am_ConnectionState_e& connectionState) {
+void CommandControlDBusStubAdapterInternal::fireMainConnectionStateChangedEvent(const am_mainConnectionID_t& connectionID, const am_ConnectionState_e& connectionState) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_mainConnectionID_t, am_ConnectionState_e>>
             ::sendSignal(
                 *this,
@@ -762,7 +746,7 @@ void CommandControlDBusStubAdapter::fireMainConnectionStateChangedEvent(const am
 /**
  * this callback indicates that a sinkSoundProperty has changed.
  */
-void CommandControlDBusStubAdapter::fireMainSinkSoundPropertyChangedEvent(const am_sinkID_t& sinkID, const am_MainSoundProperty_s& soundProperty) {
+void CommandControlDBusStubAdapterInternal::fireMainSinkSoundPropertyChangedEvent(const am_sinkID_t& sinkID, const am_MainSoundProperty_s& soundProperty) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_MainSoundProperty_s>>
             ::sendSignal(
                 *this,
@@ -774,7 +758,7 @@ void CommandControlDBusStubAdapter::fireMainSinkSoundPropertyChangedEvent(const
 /**
  * this callback indicates that a sourceSoundProperty has changed.
  */
-void CommandControlDBusStubAdapter::fireMainSourceSoundPropertyChangedEvent(const am_sourceID_t& sourceID, const am_MainSoundProperty_s& soundProperty) {
+void CommandControlDBusStubAdapterInternal::fireMainSourceSoundPropertyChangedEvent(const am_sourceID_t& sourceID, const am_MainSoundProperty_s& soundProperty) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_MainSoundProperty_s>>
             ::sendSignal(
                 *this,
@@ -786,7 +770,7 @@ void CommandControlDBusStubAdapter::fireMainSourceSoundPropertyChangedEvent(cons
 /**
  * this callback is called when the availability of a sink has changed
  */
-void CommandControlDBusStubAdapter::fireSinkAvailabilityChangedEvent(const am_sinkID_t& sinkID, const am_Availability_s& availability) {
+void CommandControlDBusStubAdapterInternal::fireSinkAvailabilityChangedEvent(const am_sinkID_t& sinkID, const am_Availability_s& availability) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_Availability_s>>
             ::sendSignal(
                 *this,
@@ -798,7 +782,7 @@ void CommandControlDBusStubAdapter::fireSinkAvailabilityChangedEvent(const am_si
 /**
  * this callback is called when the availability of source has changed.
  */
-void CommandControlDBusStubAdapter::fireSourceAvailabilityChangedEvent(const am_sourceID_t& sourceID, const am_Availability_s& availability) {
+void CommandControlDBusStubAdapterInternal::fireSourceAvailabilityChangedEvent(const am_sourceID_t& sourceID, const am_Availability_s& availability) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_Availability_s>>
             ::sendSignal(
                 *this,
@@ -810,7 +794,7 @@ void CommandControlDBusStubAdapter::fireSourceAvailabilityChangedEvent(const am_
 /**
  * this callback indicates a volume change on the indicated sink
  */
-void CommandControlDBusStubAdapter::fireVolumeChangedEvent(const am_sinkID_t& sinkID, const am_mainVolume_t& volume) {
+void CommandControlDBusStubAdapterInternal::fireVolumeChangedEvent(const am_sinkID_t& sinkID, const am_mainVolume_t& volume) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_mainVolume_t>>
             ::sendSignal(
                 *this,
@@ -822,7 +806,7 @@ void CommandControlDBusStubAdapter::fireVolumeChangedEvent(const am_sinkID_t& si
 /**
  * this callback indicates a mute state change on a sink.
  */
-void CommandControlDBusStubAdapter::fireSinkMuteStateChangedEvent(const am_sinkID_t& sinkID, const am_MuteState_e& muteState) {
+void CommandControlDBusStubAdapterInternal::fireSinkMuteStateChangedEvent(const am_sinkID_t& sinkID, const am_MuteState_e& muteState) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_MuteState_e>>
             ::sendSignal(
                 *this,
@@ -834,7 +818,7 @@ void CommandControlDBusStubAdapter::fireSinkMuteStateChangedEvent(const am_sinkI
 /**
  * is fired if a systemProperty changed
  */
-void CommandControlDBusStubAdapter::fireSystemPropertyChangedEvent(const am_SystemProperty_s& systemProperty) {
+void CommandControlDBusStubAdapterInternal::fireSystemPropertyChangedEvent(const am_SystemProperty_s& systemProperty) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_SystemProperty_s>>
             ::sendSignal(
                 *this,
@@ -846,7 +830,7 @@ void CommandControlDBusStubAdapter::fireSystemPropertyChangedEvent(const am_Syst
 /**
  * This callback is fired if the timinginformation for a mainConnectionID changed
  */
-void CommandControlDBusStubAdapter::fireTimingInformationChangedEvent(const am_mainConnectionID_t& mainConnectionID, const am_timeSync_t& time) {
+void CommandControlDBusStubAdapterInternal::fireTimingInformationChangedEvent(const am_mainConnectionID_t& mainConnectionID, const am_timeSync_t& time) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_mainConnectionID_t, am_timeSync_t>>
             ::sendSignal(
                 *this,
@@ -858,7 +842,7 @@ void CommandControlDBusStubAdapter::fireTimingInformationChangedEvent(const am_m
 /**
  * This callback is called when a sink is updated.
  */
-void CommandControlDBusStubAdapter::fireSinkUpdatedEvent(const am_sinkID_t& sinkID, const am_sinkClass_t& sinkClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
+void CommandControlDBusStubAdapterInternal::fireSinkUpdatedEvent(const am_sinkID_t& sinkID, const am_sinkClass_t& sinkClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_sinkClass_t, am_MainSoundProperty_L>>
             ::sendSignal(
                 *this,
@@ -870,7 +854,7 @@ void CommandControlDBusStubAdapter::fireSinkUpdatedEvent(const am_sinkID_t& sink
 /**
  * This callback is called when a source is updated.
  */
-void CommandControlDBusStubAdapter::fireSourceUpdatedEvent(const am_sourceID_t& sourceID, const am_sourceClass_t& sourceClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
+void CommandControlDBusStubAdapterInternal::fireSourceUpdatedEvent(const am_sourceID_t& sourceID, const am_sourceClass_t& sourceClassID, const am_MainSoundProperty_L& listMainSoundProperties) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_sourceClass_t, am_MainSoundProperty_L>>
             ::sendSignal(
                 *this,
@@ -882,7 +866,7 @@ void CommandControlDBusStubAdapter::fireSourceUpdatedEvent(const am_sourceID_t&
 /**
  * This callback is called when a notificated value of a sink changes.
  */
-void CommandControlDBusStubAdapter::fireSinkNotificationEvent(const am_sinkID_t& sinkID, const am_NotificationPayload_s& notification) {
+void CommandControlDBusStubAdapterInternal::fireSinkNotificationEvent(const am_sinkID_t& sinkID, const am_NotificationPayload_s& notification) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_NotificationPayload_s>>
             ::sendSignal(
                 *this,
@@ -894,7 +878,7 @@ void CommandControlDBusStubAdapter::fireSinkNotificationEvent(const am_sinkID_t&
 /**
  * This callback is called when a notifcated value of a source changes.
  */
-void CommandControlDBusStubAdapter::fireSourceNotificationEvent(const am_sourceID_t& sourceID, const am_NotificationPayload_s& notification) {
+void CommandControlDBusStubAdapterInternal::fireSourceNotificationEvent(const am_sourceID_t& sourceID, const am_NotificationPayload_s& notification) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_NotificationPayload_s>>
             ::sendSignal(
                 *this,
@@ -906,7 +890,7 @@ void CommandControlDBusStubAdapter::fireSourceNotificationEvent(const am_sourceI
 /**
  * This callback is triggered when a mainNotificationConfiguration is changed.
  */
-void CommandControlDBusStubAdapter::fireMainSinkNotificationConfigurationChangedEvent(const am_sinkID_t& sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
+void CommandControlDBusStubAdapterInternal::fireMainSinkNotificationConfigurationChangedEvent(const am_sinkID_t& sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, am_NotificationConfiguration_s>>
             ::sendSignal(
                 *this,
@@ -918,7 +902,7 @@ void CommandControlDBusStubAdapter::fireMainSinkNotificationConfigurationChanged
 /**
  * This callback is triggered when a mainNotificationConfiguration is changed.
  */
-void CommandControlDBusStubAdapter::fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
+void CommandControlDBusStubAdapterInternal::fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) {
     CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_sourceID_t, am_NotificationConfiguration_s>>
             ::sendSignal(
                 *this,
@@ -928,8 +912,37 @@ void CommandControlDBusStubAdapter::fireMainSourceNotificationConfigurationChang
         );
 }
 
-const CommandControlDBusStubAdapter::StubDispatcherTable& CommandControlDBusStubAdapter::getStubDispatcherTable() {
-    static const CommandControlDBusStubAdapter::StubDispatcherTable stubDispatcherTable = {
+const CommandControlDBusStubAdapterHelper::StubDispatcherTable& CommandControlDBusStubAdapterInternal::getStubDispatcherTable() {
+    return stubDispatcherTable_;
+}
+
+
+CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal(
+        const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+        const std::string& commonApiAddress,
+        const std::string& dbusInterfaceName,
+        const std::string& dbusBusName,
+        const std::string& dbusObjectPath,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+        const std::shared_ptr<CommonAPI::StubBase>& stub):
+        CommonAPI::DBus::DBusStubAdapter(
+                factory,
+                commonApiAddress,
+                dbusInterfaceName,
+                dbusBusName,
+                dbusObjectPath,
+                dbusConnection,
+                false),
+        CommandControlDBusStubAdapterHelper(
+            factory,
+            commonApiAddress,
+            dbusInterfaceName,
+            dbusBusName,
+            dbusObjectPath,
+            dbusConnection,
+            std::dynamic_pointer_cast<CommandControlStub>(stub),
+            false),
+        stubDispatcherTable_({
             /**
              * connects a source to sink
             (at)return E_OK on success, E_NOT_POSSIBLE on
@@ -1063,10 +1076,10 @@ const CommandControlDBusStubAdapter::StubDispatcherTable& CommandControlDBusStub
              *  success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error
              */
             { { "setMainSourceNotificationConfiguration", "q(qin)" }, &org::genivi::am::setMainSourceNotificationConfigurationStubDispatcher }
-            };
-    return stubDispatcherTable;
-}
+            }) {
 
+    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getCommandControlInterfaceVersionStubDispatcher });
+}
 
 } // namespace am
 } // namespace genivi
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
index 0580b16..8ef3355 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -48,9 +37,9 @@ namespace am {
 
 typedef CommonAPI::DBus::DBusStubAdapterHelper<CommandControlStub> CommandControlDBusStubAdapterHelper;
 
-class CommandControlDBusStubAdapter: public CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper {
+class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper {
  public:
-    CommandControlDBusStubAdapter(
+    CommandControlDBusStubAdapterInternal(
             const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
             const std::string& commonApiAddress,
             const std::string& dbusInterfaceName,
@@ -59,7 +48,7 @@ class CommandControlDBusStubAdapter: public CommandControlStubAdapter, public Co
             const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
             const std::shared_ptr<CommonAPI::StubBase>& stub);
 
-    ~CommandControlDBusStubAdapter();
+    ~CommandControlDBusStubAdapterInternal();
 
 
     /**
@@ -154,16 +143,46 @@ class CommandControlDBusStubAdapter: public CommandControlStubAdapter, public Co
      * This callback is triggered when a mainNotificationConfiguration is changed.
      */
     void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration);
-    
 
-    const StubDispatcherTable& getStubDispatcherTable();
-    
+
+    const CommandControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
     void deactivateManagedInstances();
 
+
  protected:
     virtual const char* getMethodsDBusIntrospectionXmlData() const;
     
   private:
+    CommandControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class CommandControlDBusStubAdapter: public CommandControlDBusStubAdapterInternal, public std::enable_shared_from_this<CommandControlDBusStubAdapter> {
+public:
+    CommandControlDBusStubAdapter(
+                         const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+                         const std::string& commonApiAddress,
+                         const std::string& dbusInterfaceName,
+                         const std::string& dbusBusName,
+                         const std::string& dbusObjectPath,
+                         const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+                         const std::shared_ptr<CommonAPI::StubBase>& stub) :
+            CommonAPI::DBus::DBusStubAdapter(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            false),
+            CommandControlDBusStubAdapterInternal(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            stub) { }
 };
 
 } // namespace am
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
index 90bcd58..656d3f7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -31,6 +20,7 @@ There are two rules that have to be kept in mind
 
 #include "CommandControlProxyBase.h"
 
+
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
@@ -43,11 +33,15 @@ namespace genivi {
 namespace am {
 
 template <typename ... _AttributeExtensions>
-class CommandControlProxy: virtual public CommandControl, virtual public CommandControlProxyBase, public _AttributeExtensions... {
- public:
+class CommandControlProxy: virtual public CommandControl, virtual public CommandControlProxyBase
+, public _AttributeExtensions... {
+public:
     CommandControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~CommandControlProxy();
 
+    typedef CommandControl InterfaceType;
+
+
 
     /**
      * Callback that is called when the number of connections change
@@ -783,7 +777,7 @@ class CommandControlProxy: virtual public CommandControl, virtual public Command
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
     virtual std::future<CommonAPI::CallStatus> setMainSourceNotificationConfigurationAsync(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration, SetMainSourceNotificationConfigurationAsyncCallback callback);
-    
+
 
     /**
      * Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -1187,7 +1181,6 @@ CommonAPI::InterfaceVersionAttribute& CommandControlProxy<_AttributeExtensions..
     return delegate_->getInterfaceVersionAttribute();
 }
 
-        
 
 } // namespace am
 } // namespace genivi
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
index 58c3abf..377547a 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
index 9767f67..6e8de18 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -179,10 +168,9 @@ class CommandControlStubAdapter: virtual public CommonAPI::StubAdapter, public C
      * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
      */
     virtual void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) = 0;
-    
-    
+
+
     virtual void deactivateManagedInstances() = 0;
-    
 protected:
     /**
      * Defines properties for storing the ClientIds of clients / proxies that have
@@ -216,9 +204,10 @@ class CommandControlStubRemoteEvent {
  * This class and the one above are the ones an application developer needs to have
  * a look at if he wants to implement a service.
  */
-class CommandControlStub : public CommonAPI::Stub<CommandControlStubAdapter , CommandControlStubRemoteEvent> {
- public:
+class CommandControlStub : public virtual CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent> {
+public:
     virtual ~CommandControlStub() { }
+    virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
 
 
     /**
@@ -490,7 +479,10 @@ class CommandControlStub : public CommonAPI::Stub<CommandControlStubAdapter , Co
      */
     /// Sends a broadcast event for mainSourceNotificationConfigurationChanged.
     virtual void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) = 0;
-    
+
+    using CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::initStubAdapter;
+    typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::StubAdapterType StubAdapterType;
+    typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
 };
 
 } // namespace am
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
index 7d588c1..f23f2da 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 #include <org/genivi/am/CommandControlStubDefault.h>
 
@@ -25,11 +14,16 @@ namespace genivi {
 namespace am {
 
 CommandControlStubDefault::CommandControlStubDefault():
-        remoteEventHandler_(this) {
+        remoteEventHandler_(this),
+        interfaceVersion_(CommandControl::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& CommandControlStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+    return interfaceVersion_;
 }
 
 CommandControlStubRemoteEvent* CommandControlStubDefault::initStubAdapter(const std::shared_ptr<CommandControlStubAdapter>& stubAdapter) {
-    stubAdapter_ = stubAdapter;
+    CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::stubAdapter_ = stubAdapter;
     return &remoteEventHandler_;
 }
 
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
index ed2dad3..2bfe6ba 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
@@ -1,22 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-*  Copyright (c) 2012 BMW
-*  
-*   \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-*  
-*   \copyright
-*   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction,
-*   including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-*   subject to the following conditions:
-*   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-*   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*    For further information see http://www.genivi.org/.
-*  
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 /**
  * The interface towards the Controlling Instance (e.g HMI). It handles the
@@ -29,6 +18,7 @@ There are two rules that have to be kept in mind
 #ifndef ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_
 #define ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_
 
+
 #include <org/genivi/am/CommandControlStub.h>
 #include <sstream>
 
@@ -46,12 +36,14 @@ namespace am {
  * that would be defined for this service, and/or if you do not need any non-default
  * behaviour.
  */
-class CommandControlStubDefault : public CommandControlStub {
- public:
+class CommandControlStubDefault : public virtual CommandControlStub {
+public:
     CommandControlStubDefault();
 
     CommandControlStubRemoteEvent* initStubAdapter(const std::shared_ptr<CommandControlStubAdapter>& stubAdapter);
 
+    const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
 
     /**
      * connects a source to sink
@@ -321,11 +313,10 @@ class CommandControlStubDefault : public CommandControlStub {
      * This callback is triggered when a mainNotificationConfiguration is changed.
      */
     virtual void fireMainSourceNotificationConfigurationChangedEvent(const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration);
-    
 
- protected:
-    std::shared_ptr<CommandControlStubAdapter> stubAdapter_;
- private:
+
+protected:
+private:
     class RemoteEventHandler: public CommandControlStubRemoteEvent {
      public:
         RemoteEventHandler(CommandControlStubDefault* defaultStub);
@@ -337,6 +328,8 @@ class CommandControlStubDefault : public CommandControlStub {
 
     RemoteEventHandler remoteEventHandler_;
 
+
+    CommonAPI::Version interfaceVersion_;
 };
 
 } // namespace am