celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [2/4] celix git commit: Merge branch 'develop' into feature/CELIX-426-cxx-api
Date Tue, 08 May 2018 19:34:26 GMT
Merge branch 'develop' into feature/CELIX-426-cxx-api


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/37217c23
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/37217c23
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/37217c23

Branch: refs/heads/feature/CELIX-426-cxx-api
Commit: 37217c23dcd0fc0fcfe1d0cb6316bb328de90ffb
Parents: 88a8baf 673837f
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue May 8 21:33:00 2018 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue May 8 21:33:00 2018 +0200

----------------------------------------------------------------------
 framework/include/bundle_context.h             | 90 ++++++++++++++-----
 framework/include/service_tracker.h            |  2 +-
 framework/private/mock/bundle_context_mock.c   | 20 ++++-
 framework/src/bundle_context.c                 | 95 +++++++++++++++------
 framework/src/service_tracker.c                | 14 ++-
 framework/tst/bundle_context_services_test.cpp | 26 +++---
 shell/include/command.h                        |  1 +
 shell/src/activator.c                          | 23 +++--
 8 files changed, 190 insertions(+), 81 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/37217c23/framework/include/bundle_context.h
----------------------------------------------------------------------
diff --cc framework/include/bundle_context.h
index 2bc582e,4ba5904..3611e23
--- a/framework/include/bundle_context.h
+++ b/framework/include/bundle_context.h
@@@ -309,17 -305,9 +305,17 @@@ typedef struct celix_service_tracker_op
   * @param opts The pointer to the tracker options.
   * @return the tracker id or < 0 if unsuccessful.
   */
- long celix_bundleContext_trackServicesWithOptions(celix_bundle_context_t *ctx, const celix_service_tracker_options_t
*opts);
+ long celix_bundleContext_trackServicesWithOptions(celix_bundle_context_t *ctx, const celix_service_tracking_options_t
*opts);
  
  
 +//TODO find services -> list of service ids.
 +celix_array_list_t* celix_bundleContext_findServices(
 +        celix_bundle_context_t *ctx,
 +        const char *serviceName,
 +        const char *versionRange,
 +        const char *filter,
 +        const char *lang
 +);
  
  /**
   * Get and lock the service with the provided service id

http://git-wip-us.apache.org/repos/asf/celix/blob/37217c23/framework/private/mock/bundle_context_mock.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/37217c23/framework/src/bundle_context.c
----------------------------------------------------------------------


Mime
View raw message