apachegh-674: Fix documentation and add test_package for rsa_utils.

Author: PengZheng

bundles/remote_services/rsa_utils/CMakeLists.txt

@@ -23,7 +23,7 @@ add_library(rsa_utils STATIC ${RSA_UTILS_SRC})
 set_target_properties(rsa_utils PROPERTIES OUTPUT_NAME "celix_rsa_utils")
 target_include_directories(rsa_utils PRIVATE src)
 target_include_directories(rsa_utils PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>)
-target_link_libraries(rsa_utils PUBLIC Celix::framework)
+target_link_libraries(rsa_utils PUBLIC Celix::utils PRIVATE Celix::framework)
 
 install(TARGETS rsa_utils EXPORT celix LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT rsa
         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/rsa_utils)

bundles/remote_services/rsa_utils/gtest/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(test_rsa_utils
         src/RsaUtilsTestSuite.cc
 )
 
-target_link_libraries(test_rsa_utils PRIVATE rsa_utils GTest::gtest GTest::gtest_main)
+target_link_libraries(test_rsa_utils PRIVATE rsa_utils GTest::gtest GTest::gtest_main Celix::framework)
 target_include_directories(test_utils PRIVATE ../src) #for version_private (needs refactoring of test)
 add_test(NAME test_rsa_utils COMMAND test_rsa_utils)
 setup_target_for_coverage(test_rsa_utils SCAN_DIR ..)

bundles/remote_services/rsa_utils/include/celix_rsa_utils.h

@@ -30,7 +30,7 @@ extern "C" {
 /**
  * @brief Create a typed service properties from endpoint properties.
  *
- * The conversion ensures that "service.ranking" and "bundle.id" (if present) are set as long values and that the
+ * The conversion ensures that "service.ranking" is set as long value and that the
  * "service.version" (if present) is set as version.
  *
  * Note that the "service.id" long "service.bundleid" properties are set during service registration and

examples/conan_test_package/CMakeLists.txt

@@ -91,6 +91,10 @@ if (TEST_RSA)
 
     add_executable(use_c_rsa_spi test_c_rsa_spi.c)
     target_link_libraries(use_c_rsa_spi PRIVATE Celix::c_rsa_spi)
+
+
+    add_executable(use_rsa_utils test_rsa_utils.cc)
+    target_link_libraries(use_rsa_utils PRIVATE Celix::rsa_utils Celix::utils)
 endif ()
 
 option(TEST_RSA_DFI "Test the Remote Service Admin Service DFI" OFF)

examples/conan_test_package/conanfile.py

@@ -77,6 +77,7 @@ def test(self):
             if self.options["celix"].build_remote_service_admin:
                 self.run("./use_my_rsa", cwd=os.path.join("deploy", "use_my_rsa"), run_environment=True)
                 self.run("./use_c_rsa_spi", run_environment=True)
+                self.run("./use_rsa_utils", run_environment=True)
             if self.options["celix"].build_rsa_remote_service_admin_dfi and self.options["celix"].build_launcher:
                 self.run("./use_rsa_dfi", cwd=os.path.join("deploy", "use_rsa_dfi"), run_environment=True)
             if self.options["celix"].build_rsa_remote_service_admin_shm_v2:

examples/conan_test_package/test_rsa_utils.cc

@@ -0,0 +1,28 @@
+//  Licensed to the Apache Software Foundation (ASF) under one
+//  or more contributor license agreements.  See the NOTICE file
+//  distributed with this work for additional information
+//  regarding copyright ownership.  The ASF licenses this file
+//  to you under the Apache License, Version 2.0 (the
+//  "License"); you may not use this file except in compliance
+//  with the License.  You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
+//
+
+#include <celix_rsa_utils.h>
+#include <celix_properties.h>
+#include <stdio.h>
+
+int main() {
+    celix_autoptr(celix_properties_t) props = nullptr;
+    celix_rsaUtils_createServicePropertiesFromEndpointProperties(nullptr, &props);
+    printf("use rsa_utils\n");
+    return 0;
+}

examples/conan_test_package_v2/conanfile.py

@@ -93,6 +93,8 @@ def test(self):
                 if celix_options.build_remote_service_admin:
                     self.run("./use_my_rsa", cwd=os.path.join("deploy", "use_my_rsa"), env="conanrun")
                     self.run("./conan_test_package/use_c_rsa_spi", env="conanrun")
+                    self.run("./conan_test_package/use_rsa_utils", env="conanrun")
+
                 if celix_options.build_rsa_remote_service_admin_dfi and celix_options.build_launcher:
                     self.run("./use_rsa_dfi", cwd=os.path.join("deploy", "use_rsa_dfi"), env="conanrun")
                 if celix_options.build_rsa_remote_service_admin_shm_v2: