This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/cxx_rsa_update in repository https://gitbox.apache.org/repos/asf/celix.git
commit 4db46af310f24f38af4fe34f77180c8ce3e0e7ba Author: Pepijn Noltes <[email protected]> AuthorDate: Thu Apr 15 21:12:03 2021 +0200 Renames async remote services to cxx remote services, because the RSA concepts are not directly coupled to async. --- bundles/CMakeLists.txt | 2 +- .../CMakeLists.txt | 0 .../admin/CMakeLists.txt | 4 +-- .../admin/gtest/CMakeLists.txt | 0 .../admin/gtest/src/RemoteServiceAdminTestSuite.cc | 0 .../admin/include/RemoteServiceAdmin.h} | 4 +-- .../admin/src/RemoteServiceAdmin.cc} | 34 +++++++++++----------- .../common/CMakeLists.txt | 0 .../common/include/ExportedServiceFactory.h | 0 .../common/include/IExportedService.h | 0 .../common/include/ImportedServiceFactory.h | 0 .../common/src/common.cc | 0 .../discovery_configured/CMakeLists.txt | 0 .../doc/configured_discovery.adoc | 0 .../include/ConfiguredDiscoveryManager.h | 0 .../include/ConfiguredDiscoveryManagerActivator.h | 0 .../include/ConfiguredEndpoint.h | 0 .../include/ConfiguredEndpointProperties.h | 0 .../src/ConfiguredDiscoveryManager.cc | 0 .../src/ConfiguredDiscoveryManagerActivator.cc | 0 .../discovery_configured/src/ConfiguredEndpoint.cc | 0 .../doc/async_remote_admin.adoc | 0 .../examples/CMakeLists.txt | 0 .../examples/HardcodedExampleProvider.cc | 0 .../examples/HardcodedExampleSerializer.cc | 0 .../examples/HardcodedExampleSerializer.h | 0 .../examples/HardcodedExampleSubscriber.cc | 0 .../examples/IHardcodedService.h | 0 .../examples/discovery/endpoint.json | 0 .../pubsub_properties/IHardcodedService.properties | 0 .../rsa_spi/CMakeLists.txt | 0 .../rsa_spi/include/celix/rsa/Constants.h | 0 .../rsa_spi/include/celix/rsa/Endpoint.h | 0 .../rsa_spi/include/celix/rsa/IEndpointAnnouncer.h | 0 .../include/celix/rsa/IExportServiceFactory.h | 0 .../rsa_spi/include/celix/rsa/IExportedService.h | 0 .../include/celix/rsa/IImportServiceFactory.h | 0 .../include/celix/rsa/RemoteServicesException.h | 0 .../topology_manager/CMakeLists.txt | 0 .../topology_manager/include/topology_manager.h | 0 .../topology_manager/src/topology_manager.cc | 0 41 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bundles/CMakeLists.txt b/bundles/CMakeLists.txt index 47083c7..fad202b 100644 --- a/bundles/CMakeLists.txt +++ b/bundles/CMakeLists.txt @@ -22,4 +22,4 @@ add_subdirectory(device_access) add_subdirectory(deployment_admin) add_subdirectory(remote_services) add_subdirectory(pubsub) -add_subdirectory(async_remote_services) +add_subdirectory(cxx_remote_services) diff --git a/bundles/async_remote_services/CMakeLists.txt b/bundles/cxx_remote_services/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/CMakeLists.txt rename to bundles/cxx_remote_services/CMakeLists.txt diff --git a/bundles/async_remote_services/admin/CMakeLists.txt b/bundles/cxx_remote_services/admin/CMakeLists.txt similarity index 91% rename from bundles/async_remote_services/admin/CMakeLists.txt rename to bundles/cxx_remote_services/admin/CMakeLists.txt index 4eee9c1..8cc9658 100644 --- a/bundles/async_remote_services/admin/CMakeLists.txt +++ b/bundles/cxx_remote_services/admin/CMakeLists.txt @@ -22,13 +22,13 @@ add_celix_bundle(RemoteServiceAdmin GROUP "Celix/RSA" FILENAME "Celix_RemoteServiceAdmin" SOURCES - src/admin.cc + src/RemoteServiceAdmin.cc ) target_include_directories(RemoteServiceAdmin PRIVATE include) target_link_libraries(RemoteServiceAdmin PRIVATE Celix::rsa_spi Celix::framework - Celix::log_helper + Celix::log_service_api ) if (ENABLE_TESTING) diff --git a/bundles/async_remote_services/admin/gtest/CMakeLists.txt b/bundles/cxx_remote_services/admin/gtest/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/admin/gtest/CMakeLists.txt rename to bundles/cxx_remote_services/admin/gtest/CMakeLists.txt diff --git a/bundles/async_remote_services/admin/gtest/src/RemoteServiceAdminTestSuite.cc b/bundles/cxx_remote_services/admin/gtest/src/RemoteServiceAdminTestSuite.cc similarity index 100% rename from bundles/async_remote_services/admin/gtest/src/RemoteServiceAdminTestSuite.cc rename to bundles/cxx_remote_services/admin/gtest/src/RemoteServiceAdminTestSuite.cc diff --git a/bundles/async_remote_services/admin/include/admin.h b/bundles/cxx_remote_services/admin/include/RemoteServiceAdmin.h similarity index 98% rename from bundles/async_remote_services/admin/include/admin.h rename to bundles/cxx_remote_services/admin/include/RemoteServiceAdmin.h index 4d1bd1f..f741af3 100644 --- a/bundles/async_remote_services/admin/include/admin.h +++ b/bundles/cxx_remote_services/admin/include/RemoteServiceAdmin.h @@ -33,9 +33,9 @@ #endif -namespace celix::async_rsa { +namespace celix::rsa { - class AsyncAdmin { + class RemoteServiceAdmin { public: // Imported endpoint add/remove functions void addEndpoint(const std::shared_ptr<celix::rsa::Endpoint>& endpoint); diff --git a/bundles/async_remote_services/admin/src/admin.cc b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc similarity index 85% rename from bundles/async_remote_services/admin/src/admin.cc rename to bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc index ee90ccb..be35f71 100644 --- a/bundles/async_remote_services/admin/src/admin.cc +++ b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.cc @@ -17,7 +17,7 @@ * under the License. */ -#include <admin.h> +#include "RemoteServiceAdmin.h" #include "celix/rsa/Constants.h" #define L_DEBUG(...) \ @@ -37,7 +37,7 @@ _logService->error(_logService->handle, __VA_ARGS__); \ } -void celix::async_rsa::AsyncAdmin::addEndpoint(const std::shared_ptr<celix::rsa::Endpoint>& endpoint) { +void celix::rsa::RemoteServiceAdmin::addEndpoint(const std::shared_ptr<celix::rsa::Endpoint>& endpoint) { assert(endpoint); auto interface = endpoint->getExportedInterfaces(); @@ -57,7 +57,7 @@ void celix::async_rsa::AsyncAdmin::addEndpoint(const std::shared_ptr<celix::rsa: createImportServices(); } -void celix::async_rsa::AsyncAdmin::removeEndpoint(const std::shared_ptr<celix::rsa::Endpoint>& endpoint) { +void celix::rsa::RemoteServiceAdmin::removeEndpoint(const std::shared_ptr<celix::rsa::Endpoint>& endpoint) { assert(endpoint); auto id = endpoint->getEndpointId(); @@ -82,7 +82,7 @@ void celix::async_rsa::AsyncAdmin::removeEndpoint(const std::shared_ptr<celix::r } } -void celix::async_rsa::AsyncAdmin::addImportedServiceFactory( +void celix::rsa::RemoteServiceAdmin::addImportedServiceFactory( const std::shared_ptr<celix::rsa::IImportServiceFactory> &factory, const std::shared_ptr<const celix::Properties> &properties) { auto targetServiceName = properties->get(celix::rsa::IImportServiceFactory::TARGET_SERVICE_NAME); @@ -104,7 +104,7 @@ void celix::async_rsa::AsyncAdmin::addImportedServiceFactory( createImportServices(); } -void celix::async_rsa::AsyncAdmin::removeImportedServiceFactory( +void celix::rsa::RemoteServiceAdmin::removeImportedServiceFactory( const std::shared_ptr<celix::rsa::IImportServiceFactory> &/*factory*/, const std::shared_ptr<const celix::Properties> &properties) { auto targetServiceName = properties->get(celix::rsa::IImportServiceFactory::TARGET_SERVICE_NAME); @@ -119,7 +119,7 @@ void celix::async_rsa::AsyncAdmin::removeImportedServiceFactory( //TODO remove imported services from this factory ??needed } -void celix::async_rsa::AsyncAdmin::addExportedServiceFactory( +void celix::rsa::RemoteServiceAdmin::addExportedServiceFactory( const std::shared_ptr<celix::rsa::IExportServiceFactory> &factory, const std::shared_ptr<const celix::Properties> &properties) { auto targetServiceName = properties->get(celix::rsa::IExportServiceFactory::TARGET_SERVICE_NAME); @@ -133,7 +133,7 @@ void celix::async_rsa::AsyncAdmin::addExportedServiceFactory( createExportServices(); } -void celix::async_rsa::AsyncAdmin::removeExportedServiceFactory( +void celix::rsa::RemoteServiceAdmin::removeExportedServiceFactory( const std::shared_ptr<celix::rsa::IExportServiceFactory> &/*factory*/, const std::shared_ptr<const celix::Properties> &properties) { auto targetServiceName = properties->get(celix::rsa::IExportServiceFactory::TARGET_SERVICE_NAME); @@ -148,7 +148,7 @@ void celix::async_rsa::AsyncAdmin::removeExportedServiceFactory( //TODO remove exported services from this factory ??needed } -void celix::async_rsa::AsyncAdmin::addService(const std::shared_ptr<void>& /*svc*/, const std::shared_ptr<const celix::Properties>& props) { +void celix::rsa::RemoteServiceAdmin::addService(const std::shared_ptr<void>& /*svc*/, const std::shared_ptr<const celix::Properties>& props) { auto serviceName = props->get(celix::SERVICE_NAME, ""); if (serviceName.empty()) { L_WARN("Adding service to be exported but missing objectclass"); @@ -160,7 +160,7 @@ void celix::async_rsa::AsyncAdmin::addService(const std::shared_ptr<void>& /*svc createExportServices(); } -void celix::async_rsa::AsyncAdmin::removeService(const std::shared_ptr<void>& /*svc*/, const std::shared_ptr<const celix::Properties>& props) { +void celix::rsa::RemoteServiceAdmin::removeService(const std::shared_ptr<void>& /*svc*/, const std::shared_ptr<const celix::Properties>& props) { long svcId = props->getAsLong(celix::SERVICE_ID, -1); if (svcId < 0) { L_WARN("Removing service to be exported but missing service.id"); @@ -183,7 +183,7 @@ void celix::async_rsa::AsyncAdmin::removeService(const std::shared_ptr<void>& /* } } -void celix::async_rsa::AsyncAdmin::createImportServices() { +void celix::rsa::RemoteServiceAdmin::createImportServices() { auto it = _toBeImportedServices.begin(); while (it != _toBeImportedServices.end()) { auto interface = (*it)->getExportedInterfaces(); @@ -200,7 +200,7 @@ void celix::async_rsa::AsyncAdmin::createImportServices() { } } -void celix::async_rsa::AsyncAdmin::createExportServices() { +void celix::rsa::RemoteServiceAdmin::createExportServices() { auto it = _toBeExportedServices.begin(); while (it != _toBeExportedServices.end()) { const auto& svcProperties = **it; @@ -221,33 +221,33 @@ void celix::async_rsa::AsyncAdmin::createExportServices() { } } -void celix::async_rsa::AsyncAdmin::setLogger(const std::shared_ptr<celix_log_service>& logService) { +void celix::rsa::RemoteServiceAdmin::setLogger(const std::shared_ptr<celix_log_service>& logService) { _logService = logService; } class AdminActivator { public: explicit AdminActivator(const std::shared_ptr<celix::BundleContext>& ctx) { - auto admin = std::make_shared<celix::async_rsa::AsyncAdmin>(); + auto admin = std::make_shared<celix::rsa::RemoteServiceAdmin>(); auto& cmp = ctx->getDependencyManager()->createComponent(admin); cmp.createServiceDependency<celix::rsa::Endpoint>() .setRequired(false) .setStrategy(celix::dm::DependencyUpdateStrategy::locking) - .setCallbacks(&celix::async_rsa::AsyncAdmin::addEndpoint, &celix::async_rsa::AsyncAdmin::removeEndpoint); + .setCallbacks(&celix::rsa::RemoteServiceAdmin::addEndpoint, &celix::rsa::RemoteServiceAdmin::removeEndpoint); cmp.createServiceDependency<celix::rsa::IImportServiceFactory>() .setRequired(false) .setStrategy(celix::dm::DependencyUpdateStrategy::locking) - .setCallbacks(&celix::async_rsa::AsyncAdmin::addImportedServiceFactory, &celix::async_rsa::AsyncAdmin::removeImportedServiceFactory); + .setCallbacks(&celix::rsa::RemoteServiceAdmin::addImportedServiceFactory, &celix::rsa::RemoteServiceAdmin::removeImportedServiceFactory); cmp.createServiceDependency<celix::rsa::IExportServiceFactory>() .setRequired(false) .setStrategy(celix::dm::DependencyUpdateStrategy::locking) - .setCallbacks(&celix::async_rsa::AsyncAdmin::addExportedServiceFactory, &celix::async_rsa::AsyncAdmin::removeExportedServiceFactory); + .setCallbacks(&celix::rsa::RemoteServiceAdmin::addExportedServiceFactory, &celix::rsa::RemoteServiceAdmin::removeExportedServiceFactory); cmp.createServiceDependency<celix_log_service>(CELIX_LOG_SERVICE_NAME) .setRequired(false) .setFilter(std::string{"("}.append(CELIX_LOG_SERVICE_PROPERTY_NAME).append("=celix::rsa::RemoteServiceAdmin)")) .setStrategy(celix::dm::DependencyUpdateStrategy::suspend) - .setCallbacks(&celix::async_rsa::AsyncAdmin::setLogger); + .setCallbacks(&celix::rsa::RemoteServiceAdmin::setLogger); cmp.build(); //note adding void service dependencies is not supported for the dependency manager, using a service tracker instead. diff --git a/bundles/async_remote_services/common/CMakeLists.txt b/bundles/cxx_remote_services/common/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/common/CMakeLists.txt rename to bundles/cxx_remote_services/common/CMakeLists.txt diff --git a/bundles/async_remote_services/common/include/ExportedServiceFactory.h b/bundles/cxx_remote_services/common/include/ExportedServiceFactory.h similarity index 100% rename from bundles/async_remote_services/common/include/ExportedServiceFactory.h rename to bundles/cxx_remote_services/common/include/ExportedServiceFactory.h diff --git a/bundles/async_remote_services/common/include/IExportedService.h b/bundles/cxx_remote_services/common/include/IExportedService.h similarity index 100% rename from bundles/async_remote_services/common/include/IExportedService.h rename to bundles/cxx_remote_services/common/include/IExportedService.h diff --git a/bundles/async_remote_services/common/include/ImportedServiceFactory.h b/bundles/cxx_remote_services/common/include/ImportedServiceFactory.h similarity index 100% rename from bundles/async_remote_services/common/include/ImportedServiceFactory.h rename to bundles/cxx_remote_services/common/include/ImportedServiceFactory.h diff --git a/bundles/async_remote_services/common/src/common.cc b/bundles/cxx_remote_services/common/src/common.cc similarity index 100% rename from bundles/async_remote_services/common/src/common.cc rename to bundles/cxx_remote_services/common/src/common.cc diff --git a/bundles/async_remote_services/discovery_configured/CMakeLists.txt b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/discovery_configured/CMakeLists.txt rename to bundles/cxx_remote_services/discovery_configured/CMakeLists.txt diff --git a/bundles/async_remote_services/discovery_configured/doc/configured_discovery.adoc b/bundles/cxx_remote_services/discovery_configured/doc/configured_discovery.adoc similarity index 100% rename from bundles/async_remote_services/discovery_configured/doc/configured_discovery.adoc rename to bundles/cxx_remote_services/discovery_configured/doc/configured_discovery.adoc diff --git a/bundles/async_remote_services/discovery_configured/include/ConfiguredDiscoveryManager.h b/bundles/cxx_remote_services/discovery_configured/include/ConfiguredDiscoveryManager.h similarity index 100% rename from bundles/async_remote_services/discovery_configured/include/ConfiguredDiscoveryManager.h rename to bundles/cxx_remote_services/discovery_configured/include/ConfiguredDiscoveryManager.h diff --git a/bundles/async_remote_services/discovery_configured/include/ConfiguredDiscoveryManagerActivator.h b/bundles/cxx_remote_services/discovery_configured/include/ConfiguredDiscoveryManagerActivator.h similarity index 100% rename from bundles/async_remote_services/discovery_configured/include/ConfiguredDiscoveryManagerActivator.h rename to bundles/cxx_remote_services/discovery_configured/include/ConfiguredDiscoveryManagerActivator.h diff --git a/bundles/async_remote_services/discovery_configured/include/ConfiguredEndpoint.h b/bundles/cxx_remote_services/discovery_configured/include/ConfiguredEndpoint.h similarity index 100% rename from bundles/async_remote_services/discovery_configured/include/ConfiguredEndpoint.h rename to bundles/cxx_remote_services/discovery_configured/include/ConfiguredEndpoint.h diff --git a/bundles/async_remote_services/discovery_configured/include/ConfiguredEndpointProperties.h b/bundles/cxx_remote_services/discovery_configured/include/ConfiguredEndpointProperties.h similarity index 100% rename from bundles/async_remote_services/discovery_configured/include/ConfiguredEndpointProperties.h rename to bundles/cxx_remote_services/discovery_configured/include/ConfiguredEndpointProperties.h diff --git a/bundles/async_remote_services/discovery_configured/src/ConfiguredDiscoveryManager.cc b/bundles/cxx_remote_services/discovery_configured/src/ConfiguredDiscoveryManager.cc similarity index 100% rename from bundles/async_remote_services/discovery_configured/src/ConfiguredDiscoveryManager.cc rename to bundles/cxx_remote_services/discovery_configured/src/ConfiguredDiscoveryManager.cc diff --git a/bundles/async_remote_services/discovery_configured/src/ConfiguredDiscoveryManagerActivator.cc b/bundles/cxx_remote_services/discovery_configured/src/ConfiguredDiscoveryManagerActivator.cc similarity index 100% rename from bundles/async_remote_services/discovery_configured/src/ConfiguredDiscoveryManagerActivator.cc rename to bundles/cxx_remote_services/discovery_configured/src/ConfiguredDiscoveryManagerActivator.cc diff --git a/bundles/async_remote_services/discovery_configured/src/ConfiguredEndpoint.cc b/bundles/cxx_remote_services/discovery_configured/src/ConfiguredEndpoint.cc similarity index 100% rename from bundles/async_remote_services/discovery_configured/src/ConfiguredEndpoint.cc rename to bundles/cxx_remote_services/discovery_configured/src/ConfiguredEndpoint.cc diff --git a/bundles/async_remote_services/doc/async_remote_admin.adoc b/bundles/cxx_remote_services/doc/async_remote_admin.adoc similarity index 100% rename from bundles/async_remote_services/doc/async_remote_admin.adoc rename to bundles/cxx_remote_services/doc/async_remote_admin.adoc diff --git a/bundles/async_remote_services/examples/CMakeLists.txt b/bundles/cxx_remote_services/examples/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/examples/CMakeLists.txt rename to bundles/cxx_remote_services/examples/CMakeLists.txt diff --git a/bundles/async_remote_services/examples/HardcodedExampleProvider.cc b/bundles/cxx_remote_services/examples/HardcodedExampleProvider.cc similarity index 100% rename from bundles/async_remote_services/examples/HardcodedExampleProvider.cc rename to bundles/cxx_remote_services/examples/HardcodedExampleProvider.cc diff --git a/bundles/async_remote_services/examples/HardcodedExampleSerializer.cc b/bundles/cxx_remote_services/examples/HardcodedExampleSerializer.cc similarity index 100% rename from bundles/async_remote_services/examples/HardcodedExampleSerializer.cc rename to bundles/cxx_remote_services/examples/HardcodedExampleSerializer.cc diff --git a/bundles/async_remote_services/examples/HardcodedExampleSerializer.h b/bundles/cxx_remote_services/examples/HardcodedExampleSerializer.h similarity index 100% rename from bundles/async_remote_services/examples/HardcodedExampleSerializer.h rename to bundles/cxx_remote_services/examples/HardcodedExampleSerializer.h diff --git a/bundles/async_remote_services/examples/HardcodedExampleSubscriber.cc b/bundles/cxx_remote_services/examples/HardcodedExampleSubscriber.cc similarity index 100% rename from bundles/async_remote_services/examples/HardcodedExampleSubscriber.cc rename to bundles/cxx_remote_services/examples/HardcodedExampleSubscriber.cc diff --git a/bundles/async_remote_services/examples/IHardcodedService.h b/bundles/cxx_remote_services/examples/IHardcodedService.h similarity index 100% rename from bundles/async_remote_services/examples/IHardcodedService.h rename to bundles/cxx_remote_services/examples/IHardcodedService.h diff --git a/bundles/async_remote_services/examples/discovery/endpoint.json b/bundles/cxx_remote_services/examples/discovery/endpoint.json similarity index 100% rename from bundles/async_remote_services/examples/discovery/endpoint.json rename to bundles/cxx_remote_services/examples/discovery/endpoint.json diff --git a/bundles/async_remote_services/examples/pubsub_properties/IHardcodedService.properties b/bundles/cxx_remote_services/examples/pubsub_properties/IHardcodedService.properties similarity index 100% rename from bundles/async_remote_services/examples/pubsub_properties/IHardcodedService.properties rename to bundles/cxx_remote_services/examples/pubsub_properties/IHardcodedService.properties diff --git a/bundles/async_remote_services/rsa_spi/CMakeLists.txt b/bundles/cxx_remote_services/rsa_spi/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/rsa_spi/CMakeLists.txt rename to bundles/cxx_remote_services/rsa_spi/CMakeLists.txt diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/Constants.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/Constants.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/Constants.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/Constants.h diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/Endpoint.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/Endpoint.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/Endpoint.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/Endpoint.h diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/IEndpointAnnouncer.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IEndpointAnnouncer.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/IEndpointAnnouncer.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IEndpointAnnouncer.h diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/IExportServiceFactory.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IExportServiceFactory.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/IExportServiceFactory.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IExportServiceFactory.h diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/IExportedService.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IExportedService.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/IExportedService.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IExportedService.h diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/IImportServiceFactory.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IImportServiceFactory.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/IImportServiceFactory.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/IImportServiceFactory.h diff --git a/bundles/async_remote_services/rsa_spi/include/celix/rsa/RemoteServicesException.h b/bundles/cxx_remote_services/rsa_spi/include/celix/rsa/RemoteServicesException.h similarity index 100% rename from bundles/async_remote_services/rsa_spi/include/celix/rsa/RemoteServicesException.h rename to bundles/cxx_remote_services/rsa_spi/include/celix/rsa/RemoteServicesException.h diff --git a/bundles/async_remote_services/topology_manager/CMakeLists.txt b/bundles/cxx_remote_services/topology_manager/CMakeLists.txt similarity index 100% rename from bundles/async_remote_services/topology_manager/CMakeLists.txt rename to bundles/cxx_remote_services/topology_manager/CMakeLists.txt diff --git a/bundles/async_remote_services/topology_manager/include/topology_manager.h b/bundles/cxx_remote_services/topology_manager/include/topology_manager.h similarity index 100% rename from bundles/async_remote_services/topology_manager/include/topology_manager.h rename to bundles/cxx_remote_services/topology_manager/include/topology_manager.h diff --git a/bundles/async_remote_services/topology_manager/src/topology_manager.cc b/bundles/cxx_remote_services/topology_manager/src/topology_manager.cc similarity index 100% rename from bundles/async_remote_services/topology_manager/src/topology_manager.cc rename to bundles/cxx_remote_services/topology_manager/src/topology_manager.cc
