You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/11/24 10:59:16 UTC
[8/8] celix git commit: CELIX-417: Renames remote services target.
Mostly adding the rsa prefix
CELIX-417: Renames remote services target. Mostly adding the rsa prefix
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/486d4f0d
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/486d4f0d
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/486d4f0d
Branch: refs/heads/feature/CELIX-417-cmake-refactor
Commit: 486d4f0d5c86f0770f047e3ecc4caf77af9886a7
Parents: 27a2aa7
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Fri Nov 24 11:58:59 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Fri Nov 24 11:58:59 2017 +0100
----------------------------------------------------------------------
remote_services/CMakeLists.txt | 1 -
remote_services/civetweb/CMakeLists.txt | 5 +-
remote_services/discovery_common/CMakeLists.txt | 10 +--
.../src/endpoint_descriptor_reader.c | 94 --------------------
.../src/endpoint_descriptor_writer.c | 37 --------
.../discovery_configured/CMakeLists.txt | 35 +++-----
remote_services/discovery_etcd/CMakeLists.txt | 23 ++---
remote_services/discovery_shm/CMakeLists.txt | 19 ++--
remote_services/examples/CMakeLists.txt | 4 +-
.../examples/calculator_service/CMakeLists.txt | 2 +-
.../remote_service_admin_api/CMakeLists.txt | 6 +-
.../remote_service_admin_common/CMakeLists.txt | 9 +-
.../remote_service_admin_dfi/CMakeLists.txt | 14 +--
.../test/CMakeLists.txt | 11 ++-
remote_services/topology_manager/CMakeLists.txt | 13 +--
.../topology_manager/tms_tst/CMakeLists.txt | 10 +--
.../tms_tst/bundle/CMakeLists.txt | 2 +-
.../tms_tst/disc_mock/CMakeLists.txt | 2 +-
18 files changed, 79 insertions(+), 218 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt
index 4e1f5b3..bb45908 100644
--- a/remote_services/CMakeLists.txt
+++ b/remote_services/CMakeLists.txt
@@ -23,7 +23,6 @@ if (REMOTE_SERVICE_ADMIN)
add_subdirectory(topology_manager)
add_subdirectory(civetweb)
-
add_subdirectory(discovery_common)
add_subdirectory(discovery_configured)
add_subdirectory(discovery_etcd)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/civetweb/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/civetweb/CMakeLists.txt b/remote_services/civetweb/CMakeLists.txt
index e9e272e..a6f7d10 100644
--- a/remote_services/civetweb/CMakeLists.txt
+++ b/remote_services/civetweb/CMakeLists.txt
@@ -20,4 +20,7 @@ add_library(civetweb OBJECT
src/civetweb.c
src/md5.inl
)
-target_include_directories(civetweb PUBLIC include)
\ No newline at end of file
+target_include_directories(civetweb PUBLIC include)
+
+#Setup target aliases to match external usage
+add_library(Celix::civetweb ALIAS civetweb)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/discovery_common/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_common/CMakeLists.txt b/remote_services/discovery_common/CMakeLists.txt
index 5b28b13..c3242a6 100644
--- a/remote_services/discovery_common/CMakeLists.txt
+++ b/remote_services/discovery_common/CMakeLists.txt
@@ -18,7 +18,7 @@
find_package(LibXml2 REQUIRED)
-add_library(discovery_common OBJECT
+add_library(rsa_discovery_common OBJECT
src/discovery.c
src/discovery_activator.c
src/endpoint_descriptor_reader.c
@@ -26,14 +26,14 @@ add_library(discovery_common OBJECT
src/endpoint_discovery_poller.c
src/endpoint_discovery_server.c
)
-target_include_directories(discovery_common PUBLIC
+target_include_directories(rsa_discovery_common PUBLIC
include src
$<TARGET_PROPERTY:Celix::framework,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:Celix::utils,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:Celix::log_helper,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:Celix::remote_service_admin_api,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:Celix::remote_service_admin_api,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::rsa_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:civetweb,INCLUDE_DIRECTORIES>
${LIBXML2_INCLUDE_DIR})
-add_library(Celix::discovery_common ALIAS discovery_common)
\ No newline at end of file
+#Setup target aliases to match external usage
+add_library(Celix::rsa_discovery_common ALIAS rsa_discovery_common)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/discovery_common/src/endpoint_descriptor_reader.c
----------------------------------------------------------------------
diff --git a/remote_services/discovery_common/src/endpoint_descriptor_reader.c b/remote_services/discovery_common/src/endpoint_descriptor_reader.c
index ea176bf..887bc29 100644
--- a/remote_services/discovery_common/src/endpoint_descriptor_reader.c
+++ b/remote_services/discovery_common/src/endpoint_descriptor_reader.c
@@ -291,97 +291,3 @@ static valueType valueTypeFromString(char *name) {
}
}
-#ifdef RSA_ENDPOINT_TEST_READER
-int main() {
- array_list_pt list = NULL;
- endpoint_descriptor_reader_pt reader = NULL;
-
- char *doc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-"<endpoint-descriptions xmlns=\"http://www.osgi.org/xmlns/rsa/v1.0.0\">"
- "<endpoint-description>"
- "<property name=\"endpoint.service.id\" value-type=\"long\" value=\"6\"/>"
- "<property name=\"endpoint.framework.uuid\" value=\"2983D849-93B1-4C2C-AC6D-5BCDA93ACB96\"/>"
- "<property name=\"service.intents\">"
- "<list>"
- "<value>SOAP</value>"
- "<value>HTTP</value>"
- "</list>"
- "</property>"
- "<property name=\"endpoint.id\" value=\"11111111-1111-1111-1111-111111111111\" />"
- "<property name=\"objectClass\"><array><value>com.acme.Foo</value></array></property>"
- "<property name=\"endpoint.package.version.com.acme\" value=\"4.2\" />"
- "<property name=\"service.imported.configs\" value=\"com.acme\" />"
- "<property name=\"service.imported\" value=\"true\"/>"
- "<property name=\"com.acme.ws.xml\">"
- "<xml>"
- "<config xmlns=\"http://acme.com/defs\">"
- "<port>1029</port>"
- "<host>www.acme.com</host>"
- "</config>"
- "</xml>"
- "</property>"
- "</endpoint-description>"
- "<endpoint-description>"
- "<property name=\"endpoint.service.id\" value-type=\"long\" value=\"5\"/>"
- "<property name=\"endpoint.framework.uuid\" value=\"2983D849-93B1-4C2C-AC6D-5BCDA93ACB96\"/>"
- "<property name=\"service.intents\">"
- "<list>"
- "<value>SOAP</value>"
- "<value>HTTP</value>"
- "</list>"
- "</property>"
- "<property name=\"endpoint.id\" value=\"22222222-2222-2222-2222-222222222222\" />"
- "<property name=\"objectClass\"><array><value>com.acme.Bar</value></array></property>"
- "<property name=\"endpoint.package.version.com.acme\" value=\"4.2\" />"
- "<property name=\"service.imported.configs\" value=\"com.acme\" />"
- "<property name=\"com.acme.ws.xml\">"
- "<xml>"
- "<config xmlns=\"http://acme.com/defs\">"
- "<port>1029</port>"
- "<host>www.acme.com</host>"
- "</config>"
- "</xml>"
- "</property>"
- "</endpoint-description>"
- "</endpoint-descriptions>";
-
- endpointDescriptorReader_create(&reader);
-
- endpointDescriptorReader_parseDocument(reader, doc, &list);
-
- int i;
- for (i = 0; i < arrayList_size(list); i++) {
- printf("\nEndpoint description #%d:\n", (i+1));
- endpoint_description_pt edp = arrayList_get(list, i);
- printf("Id: %s\n", edp->id);
- printf("Service Id: %lu\n", edp->serviceId);
- printf("Framework UUID: %s\n", edp->frameworkUUID);
- printf("Service: %s\n", edp->service);
-
- properties_pt props = edp->properties;
- if (props) {
- printf("Service properties:\n");
- hash_map_iterator_pt iter = hashMapIterator_create(props);
- while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
-
- printf("- %s => '%s'\n", hashMapEntry_getKey(entry), hashMapEntry_getValue(entry));
- }
- hashMapIterator_destroy(iter);
- } else {
- printf("No service properties...\n");
- }
-
-
- endpointDescription_destroy(edp);
- }
-
- if (list != NULL) {
- arrayList_destroy(list);
- }
-
- endpointDescriptorReader_destroy(reader);
-
- return 0;
-}
-#endif
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/discovery_common/src/endpoint_descriptor_writer.c
----------------------------------------------------------------------
diff --git a/remote_services/discovery_common/src/endpoint_descriptor_writer.c b/remote_services/discovery_common/src/endpoint_descriptor_writer.c
index 71b07b4..4a5bcd7 100644
--- a/remote_services/discovery_common/src/endpoint_descriptor_writer.c
+++ b/remote_services/discovery_common/src/endpoint_descriptor_writer.c
@@ -194,40 +194,3 @@ static char* valueTypeToString(valueType type) {
return "string";
}
}
-
-#ifdef RSA_ENDPOINT_TEST_WRITER
-int main() {
- endpoint_descriptor_writer_pt writer = NULL;
- endpointDescriptorWriter_create(&writer);
- array_list_pt list = NULL;
- arrayList_create(&list);
-
- properties_pt props = properties_create();
- properties_set(props, "objectClass", "com.acme.Foo");
- properties_set(props, "endpoint.service.id", "3");
- properties_set(props, "endpoint.id", "abcdefghijklmnopqrstuvwxyz");
- properties_set(props, "endpoint.framework.uuid", "2983D849-93B1-4C2C-AC6D-5BCDA93ACB96");
- endpoint_description_pt epd = NULL;
- endpointDescription_create(props, &epd);
- arrayList_add(list, epd);
-
- properties_pt props2 = properties_create();
- properties_set(props2, "objectClass", "com.acme.Bar");
- properties_set(props, "endpoint.service.id", "4");
- properties_set(props, "endpoint.id", "abcdefghijklmnopqrstuvwxyz");
- properties_set(props, "endpoint.framework.uuid", "2983D849-93B1-4C2C-AC6D-5BCDA93ACB96");
- endpoint_description_pt epd2 = NULL;
- endpointDescription_create(props2, &epd2);
- arrayList_add(list, epd2);
-
- char *buffer = NULL;
- endpointDescriptorWriter_writeDocument(writer, list, &buffer);
-
- arrayList_destroy(list);
- endpointDescription_destroy(epd);
- endpointDescription_destroy(epd2);
- endpointDescriptorWriter_destroy(writer);
-
- printf("%s\n", buffer);
-}
-#endif
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/discovery_configured/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_configured/CMakeLists.txt b/remote_services/discovery_configured/CMakeLists.txt
index f7d104b..bea485e 100644
--- a/remote_services/discovery_configured/CMakeLists.txt
+++ b/remote_services/discovery_configured/CMakeLists.txt
@@ -19,39 +19,24 @@ if (RSA_DISCOVERY_CONFIGURED)
find_package(CURL REQUIRED)
find_package(LibXml2 REQUIRED)
- add_bundle(discovery_configured
+ add_bundle(rsa_discovery_configured
VERSION 0.9.0
SYMBOLIC_NAME "apache_celix_rsa_discovery_configured"
NAME "Apache Celix RSA Configured Discovery"
SOURCES
src/discovery_impl.c
- $<TARGET_OBJECTS:discovery_common>
- $<TARGET_OBJECTS:civetweb>
+ $<TARGET_OBJECTS:Celix::rsa_discovery_common>
+ $<TARGET_OBJECTS:Celix::civetweb>
)
- target_include_directories(discovery_configured PRIVATE
+ target_include_directories(rsa_discovery_configured PRIVATE
src
- $<TARGET_PROPERTY:discovery_common,INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:civetweb,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>
)
- target_link_libraries(discovery_configured PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} Celix::log_helper)
+ target_link_libraries(rsa_discovery_configured PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} Celix::log_helper)
- install_bundle(discovery_configured)
+ install_bundle(rsa_discovery_configured)
-
-
- if (RSA_ENDPOINT_TEST_READER)
- add_executable(descparser
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_reader.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c)
-
- target_link_libraries(descparser ${LIBXML2_LIBRARIES} celix_framework celix_utils)
- endif (RSA_ENDPOINT_TEST_READER)
-
- if (RSA_ENDPOINT_TEST_WRITER)
- add_executable(descwriter
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_writer.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c)
-
- target_link_libraries(descwriter ${LIBXML2_LIBRARIES} celix_framework celix_utils)
- endif(RSA_ENDPOINT_TEST_WRITER)
+ #Setup target aliases to match external usage
+ add_library(Celix::rsa_discovery_configured ALIAS rsa_discovery_configured)
endif (RSA_DISCOVERY_CONFIGURED)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/discovery_etcd/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_etcd/CMakeLists.txt b/remote_services/discovery_etcd/CMakeLists.txt
index 9c8edc8..19726fc 100644
--- a/remote_services/discovery_etcd/CMakeLists.txt
+++ b/remote_services/discovery_etcd/CMakeLists.txt
@@ -21,26 +21,29 @@ if (RSA_DISCOVERY_ETCD)
find_package(LibXml2 REQUIRED)
find_package(Jansson REQUIRED)
- add_bundle(discovery_etcd
+ add_bundle(rsa_discovery_etcd
VERSION 0.9.0
SYMBOLIC_NAME "apache_celix_rsa_discovery_etcd"
NAME "Apache Celix RSA Discovery ETCD"
SOURCES
src/discovery_impl.c
src/etcd_watcher.c
- $<TARGET_OBJECTS:discovery_common>
- $<TARGET_OBJECTS:civetweb>
+ $<TARGET_OBJECTS:Celix::rsa_discovery_common>
+ $<TARGET_OBJECTS:Celix::civetweb>
)
- target_link_libraries(discovery_etcd PRIVATE Celix::log_helper Celix::etcdlib_static)
- target_include_directories(discovery_etcd PRIVATE src)
- target_include_directories(discovery_etcd PRIVATE
- $<TARGET_PROPERTY:discovery_common,INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:civetweb,INCLUDE_DIRECTORIES>
+ target_link_libraries(rsa_discovery_etcd PRIVATE Celix::log_helper Celix::etcdlib_static)
+ target_include_directories(rsa_discovery_etcd PRIVATE src)
+ target_include_directories(rsa_discovery_etcd PRIVATE
+ $<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>
${CURL_INCLUDE_DIR}
${JANSSON_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
)
- target_link_libraries(discovery_etcd PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES})
+ target_link_libraries(rsa_discovery_etcd PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES})
- install_bundle(discovery_etcd)
+ install_bundle(rsa_discovery_etcd)
+
+ #Setup target aliases to match external usage
+ add_library(Celix::rsa_discovery_etcd ALIAS rsa_discovery_etcd)
endif (RSA_DISCOVERY_ETCD)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/discovery_shm/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_shm/CMakeLists.txt b/remote_services/discovery_shm/CMakeLists.txt
index 61e54f7..fd822e6 100644
--- a/remote_services/discovery_shm/CMakeLists.txt
+++ b/remote_services/discovery_shm/CMakeLists.txt
@@ -20,7 +20,7 @@ if (RSA_DISCOVERY_SHM)
find_package(CURL REQUIRED)
find_package(LibXml2 REQUIRED)
- add_bundle(discovery_shm
+ add_bundle(rsa_discovery_shm
VERSION 0.0.1
SYMBOLIC_NAME "apache_celix_rsa_discovery_shm"
NAME "Apache Celix RSA Discovery SHM"
@@ -28,20 +28,21 @@ find_package(CURL REQUIRED)
src/discovery_shm.c
src/discovery_shmWatcher.c
src/discovery_impl.c
- $<TARGET_OBJECTS:discovery_common>
- $<TARGET_OBJECTS:civetweb>
+ $<TARGET_OBJECTS:Celix::rsa_discovery_common>
+ $<TARGET_OBJECTS:Celix::civetweb>
)
- target_include_directories(discovery_shm PRIVATE
+ target_include_directories(rsa_discovery_shm PRIVATE
src
${LIBXML2_INCLUDE_DIR}
${CURL_INCLUDE_DIR}
- $<TARGET_PROPERTY:discovery_common,INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:civetweb,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>
)
- target_link_libraries(discovery_shm PRIVATE Celix::framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
+ target_link_libraries(rsa_discovery_shm PRIVATE Celix::framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
- install_bundle(discovery_shm)
-
+ install_bundle(rsa_discovery_shm)
+ #Setup target aliases to match external usage
+ add_library(Celix::rsa_discovery_shm ALIAS rsa_discovery_shm)
endif (RSA_DISCOVERY_SHM)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/examples/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/CMakeLists.txt b/remote_services/examples/CMakeLists.txt
index 2b1f35f..78bfbac 100644
--- a/remote_services/examples/CMakeLists.txt
+++ b/remote_services/examples/CMakeLists.txt
@@ -48,13 +48,13 @@ if (RSA_EXAMPLES)
add_deploy(remote-services-dfi
NAME "server"
GROUP "remote-services/remote-services-dfi"
- BUNDLES discovery_etcd topology_manager remote_service_admin_dfi calculator Celix::shell Celix::shell_tui Celix::log_service Celix::log_writer_stdout
+ BUNDLES Celix::rsa_discovery_etcd Celix::rsa_topology_manager Celix::rsa_dfi calculator Celix::shell Celix::shell_tui Celix::log_service Celix::log_writer_stdout
)
add_deploy("remote-services-dfi-client"
NAME "client"
GROUP "remote-services/remote-services-dfi"
- BUNDLES topology_manager remote_service_admin_dfi Celix::shell Celix::shell_tui Celix::log_service Celix::log_writer_stdout calculator_shell discovery_etcd
+ BUNDLES Celix::rsa_topology_manager Celix::rsa_dfi Celix::shell Celix::shell_tui Celix::log_service Celix::log_writer_stdout calculator_shell Celix::rsa_discovery_etcd
)
endif ()
endif (RSA_EXAMPLES)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/examples/calculator_service/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/calculator_service/CMakeLists.txt b/remote_services/examples/calculator_service/CMakeLists.txt
index ff4d2d7..5d97d16 100644
--- a/remote_services/examples/calculator_service/CMakeLists.txt
+++ b/remote_services/examples/calculator_service/CMakeLists.txt
@@ -23,7 +23,7 @@ add_bundle(calculator
VERSION 0.0.1
)
target_include_directories(calculator PRIVATE src)
-target_link_libraries(calculator PRIVATE Celix::remote_service_admin_api calculator_api)
+target_link_libraries(calculator PRIVATE Celix::rsa_api calculator_api)
get_target_property(DESCR calculator_api INTERFACE_CALCULATOR_DESCRIPTOR)
bundle_files(calculator ${DESCR} DESTINATION .)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/remote_service_admin_api/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_api/CMakeLists.txt b/remote_services/remote_service_admin_api/CMakeLists.txt
index a7d0640..f665576 100644
--- a/remote_services/remote_service_admin_api/CMakeLists.txt
+++ b/remote_services/remote_service_admin_api/CMakeLists.txt
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-add_library(remote_service_admin_api INTERFACE)
-target_include_directories(remote_service_admin_api INTERFACE include)
+add_library(rsa_api INTERFACE)
+target_include_directories(rsa_api INTERFACE include)
install (FILES
include/remote_endpoint_impl.h
@@ -42,4 +42,4 @@ install (FILES
)
#Setup target aliases to match external usage
-add_library(Celix::remote_service_admin_api ALIAS remote_service_admin_api)
+add_library(Celix::rsa_api ALIAS rsa_api)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/remote_service_admin_common/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_common/CMakeLists.txt b/remote_services/remote_service_admin_common/CMakeLists.txt
index a421cda..018d868 100644
--- a/remote_services/remote_service_admin_common/CMakeLists.txt
+++ b/remote_services/remote_service_admin_common/CMakeLists.txt
@@ -15,12 +15,13 @@
# specific language governing permissions and limitations
# under the License.
-add_library(remote_service_admin_common STATIC
+add_library(rsa_common STATIC
src/endpoint_description.c
src/export_registration_impl.c
src/import_registration_impl.c
)
-target_include_directories(remote_service_admin_common PRIVATE src)
-target_link_libraries(remote_service_admin_common PUBLIC Celix::framework Celix::remote_service_admin_api Celix::log_helper)
+target_include_directories(rsa_common PRIVATE src)
+target_link_libraries(rsa_common PUBLIC Celix::framework Celix::rsa_api Celix::log_helper)
-add_library(Celix::remote_service_admin_common ALIAS remote_service_admin_common)
\ No newline at end of file
+#Setup target aliases to match external usage
+add_library(Celix::rsa_common ALIAS rsa_common)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/remote_service_admin_dfi/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/CMakeLists.txt b/remote_services/remote_service_admin_dfi/CMakeLists.txt
index 206c6dc..ea79c31 100644
--- a/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -23,7 +23,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
find_package(CURL REQUIRED)
find_package(Jansson REQUIRED)
- add_bundle(remote_service_admin_dfi
+ add_bundle(rsa_dfi
VERSION 0.9.0
SYMBOLIC_NAME "apache_celix_remote_service_admin_dfi"
NAME "Apache Celix Remote Service Admin Dynamic Function Interface (DFI)"
@@ -33,21 +33,21 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
src/export_registration_dfi.c
src/import_registration_dfi.c
src/dfi_utils.c
- $<TARGET_OBJECTS:civetweb>
+ $<TARGET_OBJECTS:Celix::civetweb>
)
- target_include_directories(remote_service_admin_dfi PRIVATE src $<TARGET_PROPERTY:civetweb,INCLUDE_DIRECTORIES>)
- target_link_libraries(remote_service_admin_dfi PRIVATE
+ target_include_directories(rsa_dfi PRIVATE src $<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>)
+ target_link_libraries(rsa_dfi PRIVATE
Celix::dfi_static
Celix::log_helper
- Celix::remote_service_admin_common
+ Celix::rsa_common
${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
- install_bundle(remote_service_admin_dfi)
+ install_bundle(rsa_dfi)
if (ENABLE_TESTING)
add_subdirectory(test)
endif()
#Setup target aliases to match external usage
- add_library(Celix::remote_service_admin_dfi ALIAS remote_service_admin_dfi)
+ add_library(Celix::rsa_dfi ALIAS rsa_dfi)
endif()
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/remote_service_admin_dfi/test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/test/CMakeLists.txt b/remote_services/remote_service_admin_dfi/test/CMakeLists.txt
index a78a6d0..153b3d1 100644
--- a/remote_services/remote_service_admin_dfi/test/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/test/CMakeLists.txt
@@ -36,15 +36,14 @@ add_executable(test_rsa_dfi
target_include_directories(test_rsa_dfi PRIVATE src)
target_link_libraries(test_rsa_dfi PRIVATE ${CURL_LIBRARIES} ${CPPUTEST_LIBRARY}
Celix::framework
- Celix::remote_service_admin_api
- Celix::remote_service_admin_common
+ Celix::rsa_common
calculator_api)
-get_property(rsa_bundle_file TARGET remote_service_admin_dfi PROPERTY BUNDLE_FILE)
+get_property(rsa_bundle_file TARGET rsa_dfi PROPERTY BUNDLE_FILE)
get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE_FILE)
get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE_FILE)
-get_property(discovery_configured_bundle_file TARGET discovery_configured PROPERTY BUNDLE_FILE)
-get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE_FILE)
+get_property(discovery_configured_bundle_file TARGET rsa_discovery_configured PROPERTY BUNDLE_FILE)
+get_property(topology_manager_bundle_file TARGET Celix::rsa_topology_manager PROPERTY BUNDLE_FILE)
get_property(tst_bundle_file TARGET rsa_dfi_tst_bundle PROPERTY BUNDLE_FILE)
configure_file(config.properties.in config.properties)
@@ -52,7 +51,7 @@ configure_file(client.properties.in client.properties)
configure_file(server.properties.in server.properties)
add_dependencies(test_rsa_dfi
- remote_service_admin_dfi_bundle #note depend on the target creating the bundle zip not the lib target
+ rsa_dfi_bundle #note depend on the target creating the bundle zip not the lib target
calculator_bundle
)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/CMakeLists.txt b/remote_services/topology_manager/CMakeLists.txt
index defee5c..568054e 100644
--- a/remote_services/topology_manager/CMakeLists.txt
+++ b/remote_services/topology_manager/CMakeLists.txt
@@ -17,7 +17,7 @@
celix_subproject(RSA_TOPOLOGY_MANAGER "Option to enable building the Remote Service Admin Service SHM bundle" ON DEPS REMOTE_SERVICE_ADMIN_DFI)
if (RSA_TOPOLOGY_MANAGER)
- add_bundle(topology_manager
+ add_bundle(rsa_topology_manager
SOURCES
src/topology_manager
src/scope
@@ -26,11 +26,11 @@ if (RSA_TOPOLOGY_MANAGER)
SYMBOLIC_NAME "apache_celix_rs_topology_manager"
NAME "Apache Celix RS Topology Manager"
)
- target_include_directories(topology_manager PRIVATE src)
- target_include_directories(topology_manager PUBLIC include)
- target_link_libraries(topology_manager PRIVATE Celix::log_helper remote_service_admin_api)
+ target_include_directories(rsa_topology_manager PRIVATE src)
+ target_include_directories(rsa_topology_manager PUBLIC include)
+ target_link_libraries(rsa_topology_manager PRIVATE Celix::log_helper Celix::rsa_api)
- install_bundle(topology_manager)
+ install_bundle(rsa_topology_manager)
if (ENABLE_TESTING)
find_package(CppUTest REQUIRED)
@@ -41,4 +41,7 @@ if (RSA_TOPOLOGY_MANAGER)
include_directories(${CPPUTEST_EXT_INCLUDE_DIR})
add_subdirectory(tms_tst)
endif (ENABLE_TESTING)
+
+ #Setup target aliases to match external usage
+ add_library(Celix::rsa_topology_manager ALIAS rsa_topology_manager)
endif (RSA_TOPOLOGY_MANAGER)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/topology_manager/tms_tst/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/tms_tst/CMakeLists.txt b/remote_services/topology_manager/tms_tst/CMakeLists.txt
index 5e27139..6dedf32 100644
--- a/remote_services/topology_manager/tms_tst/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/CMakeLists.txt
@@ -42,18 +42,16 @@ target_link_libraries(test_tm_scoped PRIVATE
Celix::framework
${CPPUTEST_LIBRARY}
${JANSSON_LIBRARY}
- Celix::log_helper
calculator_api
- Celix::remote_service_admin_api
- Celix::remote_service_admin_common
+ Celix::rsa_common
)
-add_dependencies(test_tm_scoped remote_service_admin_dfi_bundle topology_manager_bundle)
+add_dependencies(test_tm_scoped rsa_dfi_bundle rsa_topology_manager_bundle)
file(GENERATE
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/config.properties"
CONTENT "
-cosgi.auto.start.1=$<TARGET_PROPERTY:remote_service_admin_dfi,BUNDLE_FILE> $<TARGET_PROPERTY:calculator,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager_disc_mock_bundle,BUNDLE_FILE>
+cosgi.auto.start.1=$<TARGET_PROPERTY:Celix::rsa_dfi,BUNDLE_FILE> $<TARGET_PROPERTY:calculator,BUNDLE_FILE> $<TARGET_PROPERTY:Celix::rsa_topology_manager,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager_disc_mock_bundle,BUNDLE_FILE>
LOGHELPER_ENABLE_STDOUT_FALLBACK=true
org.osgi.framework.storage.clean=onFirstInit
")
@@ -61,7 +59,7 @@ org.osgi.framework.storage.clean=onFirstInit
file(GENERATE
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/config_import.properties"
CONTENT "
-cosgi.auto.start.1=$<TARGET_PROPERTY:remote_service_admin_dfi,BUNDLE_FILE> $<TARGET_PROPERTY:calculator,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager_test_bundle,BUNDLE_FILE>
+cosgi.auto.start.1=$<TARGET_PROPERTY:Celix::rsa_dfi,BUNDLE_FILE> $<TARGET_PROPERTY:calculator,BUNDLE_FILE> $<TARGET_PROPERTY:Celix::rsa_topology_manager,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager_test_bundle,BUNDLE_FILE>
LOGHELPER_ENABLE_STDOUT_FALLBACK=true
org.osgi.framework.storage.clean=onFirstInit
")
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
index 551995b..eaf0a26 100644
--- a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
@@ -32,4 +32,4 @@ bundle_files(topology_manager_test_bundle
DESTINATION .
)
-target_link_libraries(topology_manager_test_bundle PRIVATE ${CPPUTEST_LIBRARY} Celix::remote_service_admin_api calculator_api)
+target_link_libraries(topology_manager_test_bundle PRIVATE ${CPPUTEST_LIBRARY} Celix::rsa_api calculator_api)
http://git-wip-us.apache.org/repos/asf/celix/blob/486d4f0d/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt b/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
index 653b69c..3e93174 100644
--- a/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
@@ -23,6 +23,6 @@ add_bundle(topology_manager_disc_mock_bundle
)
target_include_directories(topology_manager_disc_mock_bundle PRIVATE
${CPPUTEST_INCLUDE_DIR}
- $<TARGET_PROPERTY:discovery_common,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>
)
target_link_libraries(topology_manager_disc_mock_bundle PRIVATE ${CPPUTEST_LIBRARY} Celix::framework)