* some naming adoptions & review for GENIVI

Signed-off-by: Christian Linke <christian.linke@bmw.de>

10 files changed, 0 insertions, 805 deletions

diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
deleted file mode 100644
index d4e071d..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-class LifeCycleConsumer {
- public:
-    virtual ~LifeCycleConsumer() { }
-
-    static inline const char* getInterfaceId();
-    static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* LifeCycleConsumer::getInterfaceId() {
-    return "org.genivi.NodeStateManager.LifeCycleConsumer.LifeCycleConsumer";
-}
-
-CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
-    return CommonAPI::Version(0, 1);
-}
-
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
-    //hashes for types
-    
-    //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp
deleted file mode 100644
index 5df88da..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#include "LifeCycleConsumerDBusProxy.h"
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createLifeCycleConsumerDBusProxy(
-                    const std::string& commonApiAddress,
-                    const std::string& interfaceName,
-                    const std::string& busName,
-                    const std::string& objectPath,
-                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection) {
-    return std::make_shared<LifeCycleConsumerDBusProxy>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
-}
-
-__attribute__((constructor)) void registerLifeCycleConsumerDBusProxy(void) {
-    CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(LifeCycleConsumer::getInterfaceId(),
-       &createLifeCycleConsumerDBusProxy);
-}
-
-LifeCycleConsumerDBusProxy::LifeCycleConsumerDBusProxy(
-                    const std::string& commonApiAddress,
-                    const std::string& interfaceName,
-                    const std::string& busName,
-                    const std::string& objectPath,
-                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
-        CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
- {
-}
-
-
-
-void LifeCycleConsumerDBusProxy::LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, uint32_t>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
-        *this,
-        "LifecycleRequest",
-        "uu",
-        Request, RequestId, 
-        callStatus
-        , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> LifeCycleConsumerDBusProxy::LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, uint32_t>,
-                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
-        *this,
-        "LifecycleRequest",
-        "uu",
-        Request, RequestId, 
-        std::move(callback));
-}
-
-void LifeCycleConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-    ownVersionMajor = 0;
-    ownVersionMinor = 1;
-}
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h
deleted file mode 100644
index 7c4522d..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
-
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusFactory.h>
-#include <CommonAPI/DBus/DBusProxy.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-#include <string>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
- public:
-    LifeCycleConsumerDBusProxy(
-                    const std::string& commonApiAddress,
-                    const std::string& interfaceName,
-                    const std::string& busName,
-                    const std::string& objectPath,
-                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection);
-
-    virtual ~LifeCycleConsumerDBusProxy() { }
-
-
-
-
-    virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
-    
-    virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
-
- private:
-
-};
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp
deleted file mode 100644
index e408a47..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#include "LifeCycleConsumerDBusStubAdapter.h"
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLifeCycleConsumerDBusStubAdapter(
-                   const std::string& commonApiAddress,
-                   const std::string& interfaceName,
-                   const std::string& busName,
-                   const std::string& objectPath,
-                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection,
-                   const std::shared_ptr<CommonAPI::StubBase>& stubBase) {
-    return std::make_shared<LifeCycleConsumerDBusStubAdapter>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
-}
-
-__attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void) {
-    CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(LifeCycleConsumer::getInterfaceId(),
-                                                               &createLifeCycleConsumerDBusStubAdapter);
-}
-
-LifeCycleConsumerDBusStubAdapter::LifeCycleConsumerDBusStubAdapter(
-        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):
-        LifeCycleConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub)) {
-}
-
-const char* LifeCycleConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
-    return
-        "<method name=\"LifecycleRequest\">\n"
-            "<arg name=\"Request\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
-        "</method>\n"
-    ;
-}
-
-
-
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LifeCycleConsumerStub,
-    std::tuple<uint32_t, uint32_t>,
-    std::tuple<int32_t>
-    > lifecycleRequestStubDispatcher(&LifeCycleConsumerStub::LifecycleRequest, "i");
-
-
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-template<>
-const org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
-    { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::LifeCycleConsumer::lifecycleRequestStubDispatcher }
-};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h
deleted file mode 100644
index 74e41a4..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
-#include <CommonAPI/DBus/DBusFactory.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
-
-class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
- public:
-    LifeCycleConsumerDBusStubAdapter(
-            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);
-    
-
-
- protected:
-    virtual const char* getMethodsDBusIntrospectionXmlData() const;
-};
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h
deleted file mode 100644
index f8e21ed..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
-
-#include "LifeCycleConsumerProxyBase.h"
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-template <typename ... _AttributeExtensions>
-class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
- public:
-    LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
-    ~LifeCycleConsumerProxy();
-
-
-
-
-    /**
-     * Calls LifecycleRequest with synchronous semantics.
-     * 
-     * All const parameters are input parameters to this method.
-     * All non-const parameters will be filled with the returned values.
-     * The CallStatus will be filled when the method returns and indicate either
-     * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
-     * will be set.
-     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
-     */
-    virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
-    /**
-     * Calls LifecycleRequest with asynchronous semantics.
-     * 
-     * The provided callback will be called when the reply to this call arrives or
-     * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
-     * or which type of error has occurred. In case of any error, ONLY the CallStatus
-     * will have a defined value.
-     * The std::future returned by this method will be fulfilled at arrival of the reply.
-     * It will provide the same value for CallStatus as will be handed to the callback.
-     */
-    virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
-
-    /// Returns the CommonAPI address of the remote partner this proxy communicates with.
-    virtual std::string getAddress() const;
-
-    /// Returns the domain of the remote partner this proxy communicates with.
-    virtual const std::string& getDomain() const;
-
-    /// Returns the service ID of the remote partner this proxy communicates with.
-    virtual const std::string& getServiceId() const;
-
-    /// Returns the instance ID of the remote partner this proxy communicates with.
-    virtual const std::string& getInstanceId() const;
-
-    /// Returns true if the remote partner for this proxy is available.
-    virtual bool isAvailable() const;
-
-    /**
-     * Returns the wrapper class that is used to (de-)register for notifications about
-     * the availability of the remote partner of this proxy.
-     */
-    virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent();
-
-    /**
-     * Returns the wrapper class that is used to access version information of the remote
-     * partner of this proxy.
-     */
-    virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute();
-
- private:
-    std::shared_ptr<LifeCycleConsumerProxyBase> delegate_;
-};
-
-
-//
-// LifeCycleConsumerProxy Implementation
-//
-template <typename ... _AttributeExtensions>
-LifeCycleConsumerProxy<_AttributeExtensions...>::LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
-        delegate_(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)),
-        _AttributeExtensions(*(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)))... {
-}
-
-template <typename ... _AttributeExtensions>
-LifeCycleConsumerProxy<_AttributeExtensions...>::~LifeCycleConsumerProxy() {
-}
-
-template <typename ... _AttributeExtensions>
-void LifeCycleConsumerProxy<_AttributeExtensions...>::LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
-    delegate_->LifecycleRequest(Request, RequestId, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> LifeCycleConsumerProxy<_AttributeExtensions...>::LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) {
-    return delegate_->LifecycleRequestAsync(Request, RequestId, callback);
-}
-
-
-template <typename ... _AttributeExtensions>
-std::string LifeCycleConsumerProxy<_AttributeExtensions...>::getAddress() const {
-    return delegate_->getAddress();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getDomain() const {
-    return delegate_->getDomain();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getServiceId() const {
-    return delegate_->getServiceId();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getInstanceId() const {
-    return delegate_->getInstanceId();
-}
-
-template <typename ... _AttributeExtensions>
-bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailable() const {
-    return delegate_->isAvailable();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::ProxyStatusEvent& LifeCycleConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
-    return delegate_->getProxyStatusEvent();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
-    return delegate_->getInterfaceVersionAttribute();
-}
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h
deleted file mode 100644
index 3e780d0..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h
+++ /dev/null
@@ -1,58 +0,0 @@
- /*
- * This file was generated by the CommonAPI Generators.
- *
-  * Copyright (C) 2012, BMW AG
-  *
-  * This file is part of GENIVI Project AudioManager.
-  *
-  * Contributions are licensed to the GENIVI Alliance under one or more
-  * Contribution License Agreements.
-  *
-  * \copyright
-  * 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/.
-  *
-  *
-  * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
-  *
-  * For further information see http://www.genivi.org/.
- */
- #ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
- 
- #include "LifeCycleConsumer.h"
- 
- 
- 
- #define COMMONAPI_INTERNAL_COMPILATION
- 
-
- #include <CommonAPI/Proxy.h>
- #include <functional>
- #include <future>
- 
- #undef COMMONAPI_INTERNAL_COMPILATION
-
- namespace org {
- namespace genivi {
- namespace NodeStateManager {
- namespace LifeCycleConsumer {
-
- class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy {
-  public:
-     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestAsyncCallback;
-
-
-
-
-     virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
-     virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0;
- };
-
- } // namespace LifeCycleConsumer
- } // namespace NodeStateManager
- } // namespace genivi
- } // namespace org
-
- #endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h
deleted file mode 100644
index f4d9d80..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
-
-
-
-
-#include "LifeCycleConsumer.h"
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-
-#include <CommonAPI/Stub.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-/**
- * Receives messages from remote and handles all dispatching of deserialized calls
- * to a stub for the service LifeCycleConsumer. Also provides means to send broadcasts
- * and attribute-changed-notifications of observable attributes as defined by this service.
- * An application developer should not need to bother with this class.
- */
-class LifeCycleConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public LifeCycleConsumer {
- public:
-
-};
-
-
-/**
- * Defines the necessary callbacks to handle remote set events related to the attributes
- * defined in the IDL description for LifeCycleConsumer.
- * For each attribute two callbacks are defined:
- * - a verification callback that allows to verify the requested value and to prevent setting
- *   e.g. an invalid value ("onRemoteSet<AttributeName>").
- * - an action callback to do local work after the attribute value has been changed
- *   ("onRemote<AttributeName>Changed").
- *
- * This class and the one below are the ones an application developer needs to have
- * a look at if he wants to implement a service.
- */
-class LifeCycleConsumerStubRemoteEvent {
- public:
-    virtual ~LifeCycleConsumerStubRemoteEvent() { }
-
-};
-
-
-/**
- * Defines the interface that must be implemented by any class that should provide
- * the service LifeCycleConsumer to remote clients.
- * 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 LifeCycleConsumerStub : public CommonAPI::Stub<LifeCycleConsumerStubAdapter , LifeCycleConsumerStubRemoteEvent> {
- public:
-    virtual ~LifeCycleConsumerStub() { }
-
-
-    /// This is the method that will be called on remote calls on the method LifecycleRequest.
-    virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) = 0;
-    
-};
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp
deleted file mode 100644
index 92df0f0..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
-        remoteEventHandler_(this) {
-}
-
-LifeCycleConsumerStubRemoteEvent* LifeCycleConsumerStubDefault::initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter) {
-    stubAdapter_ = stubAdapter;
-    return &remoteEventHandler_;
-}
-
-
-void LifeCycleConsumerStubDefault::LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) {
-    // No operation in default
-}
-
-
-
-LifeCycleConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub):
-        defaultStub_(defaultStub) {
-}
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h
deleted file mode 100644
index 6c5f402..0000000
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2012, BMW AG
- *
- * This file is part of GENIVI Project AudioManager.
- *
- * Contributions are licensed to the GENIVI Alliance under one or more
- * Contribution License Agreements.
- *
- * \copyright
- * 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/.
- *
- *
- * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
- *
- * For further information see http://www.genivi.org/.
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-
-#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-namespace LifeCycleConsumer {
-
-/**
- * Provides a default implementation for LifeCycleConsumerStubRemoteEvent and
- * LifeCycleConsumerStub. Method callbacks have an empty implementation,
- * remote set calls on attributes will always change the value of the attribute
- * to the one received.
- * 
- * Override this stub if you only want to provide a subset of the functionality
- * that would be defined for this service, and/or if you do not need any non-default
- * behaviour.
- */
-class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
- public:
-    LifeCycleConsumerStubDefault();
-
-    LifeCycleConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter);
-
-
-    virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
-
-    
-
- protected:
-    
- private:
-    class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent {
-     public:
-        RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub);
-
-
-     private:
-        LifeCycleConsumerStubDefault* defaultStub_;
-    };
-
-    RemoteEventHandler remoteEventHandler_;
-    std::shared_ptr<LifeCycleConsumerStubAdapter> stubAdapter_;
-
-};
-
-} // namespace LifeCycleConsumer
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_