This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-osgi-defines in repository https://gitbox.apache.org/repos/asf/celix.git
commit 4801559e1b77d68a401eb2dd91e07987e5786992 Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Oct 29 14:06:22 2023 +0100 #509: Repair some incorrect config properties updates --- .../remote_service_admin_dfi/gtest/client.properties.in | 2 +- .../remote_service_admin_dfi/gtest/config.properties.in | 2 +- .../remote_service_admin_dfi/gtest/server.properties.in | 2 +- .../remote_services/topology_manager/tms_tst/bundle/tst_activator.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundles/remote_services/remote_service_admin_dfi/gtest/client.properties.in b/bundles/remote_services/remote_service_admin_dfi/gtest/client.properties.in index 6e98c5a8..506ed25e 100644 --- a/bundles/remote_services/remote_service_admin_dfi/gtest/client.properties.in +++ b/bundles/remote_services/remote_service_admin_dfi/gtest/client.properties.in @@ -1,4 +1,4 @@ -CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR=@rsa_bundle_file@ @discovery_bundle_file@ @topology_manager_bundle_file@ @tst_bundle_file@ +CELIX_AUTO_START_1=@rsa_bundle_file@ @discovery_bundle_file@ @topology_manager_bundle_file@ @tst_bundle_file@ LOGHELPER_ENABLE_STDOUT_FALLBACK=true CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE=true CELIX_FRAMEWORK_CACHE_DIR=.cacheClient diff --git a/bundles/remote_services/remote_service_admin_dfi/gtest/config.properties.in b/bundles/remote_services/remote_service_admin_dfi/gtest/config.properties.in index c500d29f..52730b28 100644 --- a/bundles/remote_services/remote_service_admin_dfi/gtest/config.properties.in +++ b/bundles/remote_services/remote_service_admin_dfi/gtest/config.properties.in @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR=@rsa_bundle_file@ @calc_bundle_file@ +CELIX_AUTO_START_1=@rsa_bundle_file@ @calc_bundle_file@ LOGHELPER_ENABLE_STDOUT_FALLBACK=true CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE=true diff --git a/bundles/remote_services/remote_service_admin_dfi/gtest/server.properties.in b/bundles/remote_services/remote_service_admin_dfi/gtest/server.properties.in index c9821c6a..7812c7fe 100644 --- a/bundles/remote_services/remote_service_admin_dfi/gtest/server.properties.in +++ b/bundles/remote_services/remote_service_admin_dfi/gtest/server.properties.in @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR=@rsa_bundle_file@ @calc_bundle_file@ @remote_example_bundle_file@ @discovery_bundle_file@ @topology_manager_bundle_file@ +CELIX_AUTO_START_1=@rsa_bundle_file@ @calc_bundle_file@ @remote_example_bundle_file@ @discovery_bundle_file@ @topology_manager_bundle_file@ LOGHELPER_ENABLE_STDOUT_FALLBACK=true CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE=true CELIX_FRAMEWORK_CACHE_DIR=.cacheServer diff --git a/bundles/remote_services/topology_manager/tms_tst/bundle/tst_activator.c b/bundles/remote_services/topology_manager/tms_tst/bundle/tst_activator.c index a89142c0..2e542195 100644 --- a/bundles/remote_services/topology_manager/tms_tst/bundle/tst_activator.c +++ b/bundles/remote_services/topology_manager/tms_tst/bundle/tst_activator.c @@ -49,7 +49,7 @@ static celix_status_t removeImport(void * handle, service_reference_pt reference static bool IsImported(void *handle); -celix_status_t bundleActivator_create(celix_bundle_context_t *context, void **out) { +celix_status_t celix_bundleActivator_create(celix_bundle_context_t *context, void **out) { celix_status_t status = CELIX_SUCCESS; struct activator *act = calloc(1, sizeof(*act)); if (act != NULL) { @@ -121,7 +121,7 @@ celix_status_t celix_bundleActivator_stop(void * userData, celix_bundle_context_ return status; } -celix_status_t bundleActivator_destroy(void * userData, celix_bundle_context_t *context) { +celix_status_t celix_bundleActivator_destroy(void * userData, celix_bundle_context_t *context) { struct activator *act = userData; if (act != NULL) { if (act->tracker != NULL) {
