celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [06/13] celix git commit: CELIX-412: Refactors usage of add_bundle and add_deploy to add_celix_bundle and add_celix_container
Date Tue, 30 Jan 2018 19:24:35 GMT
CELIX-412: Refactors usage of add_bundle and add_deploy to add_celix_bundle and add_celix_container


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

Branch: refs/heads/develop
Commit: 68775a042db99c51d8aad33f9e20b049c183daf3
Parents: ee29b00
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Jan 16 16:24:23 2018 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Jan 16 16:24:23 2018 +0100

----------------------------------------------------------------------
 cmake/cmake_celix/BundlePackaging.cmake         | 26 ++++++++++----------
 cmake/cmake_celix/DeployPackaging.cmake         | 10 ++++----
 config_admin/CMakeLists.txt                     |  2 +-
 .../example_test/CMakeLists.txt                 |  2 +-
 .../example_test2/CMakeLists.txt                |  2 +-
 config_admin/example/CMakeLists.txt             |  2 +-
 config_admin/service/CMakeLists.txt             |  2 +-
 dependency_manager/CMakeLists.txt               |  4 +--
 deployment_admin/CMakeLists.txt                 |  6 ++---
 device_access/device_access/CMakeLists.txt      |  4 +--
 device_access/driver_locator/CMakeLists.txt     |  4 +--
 device_access/example/CMakeLists.txt            |  2 +-
 .../example/base_driver/CMakeLists.txt          |  2 +-
 .../example/consuming_driver/CMakeLists.txt     |  2 +-
 .../example/refining_driver/CMakeLists.txt      |  2 +-
 documents/cmake_commands/readme.md              |  4 +--
 .../getting_started/creating_a_simple_bundle.md | 19 ++++++--------
 event_admin/CMakeLists.txt                      |  6 ++---
 event_admin/event_admin/CMakeLists.txt          |  4 +--
 event_admin/event_handler/CMakeLists.txt        |  4 +--
 event_admin/event_publisher/CMakeLists.txt      |  4 +--
 examples/dm_example/CMakeLists.txt              |  2 +-
 examples/dm_example/phase1/CMakeLists.txt       |  2 +-
 examples/dm_example/phase2a/CMakeLists.txt      |  2 +-
 examples/dm_example/phase2b/CMakeLists.txt      |  2 +-
 examples/dm_example/phase3/CMakeLists.txt       |  2 +-
 examples/dm_example_cxx/CMakeLists.txt          |  2 +-
 examples/dm_example_cxx/phase1/CMakeLists.txt   |  2 +-
 examples/dm_example_cxx/phase2a/CMakeLists.txt  |  2 +-
 examples/dm_example_cxx/phase2b/CMakeLists.txt  |  2 +-
 examples/dm_example_cxx/phase3/CMakeLists.txt   |  2 +-
 .../phase3_locking/CMakeLists.txt               |  2 +-
 examples/hello_world/CMakeLists.txt             | 10 ++++----
 examples/hello_world_test/CMakeLists.txt        | 16 ++++++------
 examples/log_service_example/CMakeLists.txt     |  4 +--
 examples/mongoose/CMakeLists.txt                |  6 ++---
 examples/service_hook_example/CMakeLists.txt    |  4 +--
 examples/services_example_c/CMakeLists.txt      |  2 +-
 examples/services_example_c/bar/CMakeLists.txt  |  2 +-
 examples/services_example_c/foo1/CMakeLists.txt |  2 +-
 examples/services_example_c/foo2/CMakeLists.txt |  2 +-
 examples/services_example_cxx/CMakeLists.txt    |  2 +-
 .../services_example_cxx/bar/CMakeLists.txt     |  2 +-
 .../services_example_cxx/baz/CMakeLists.txt     |  2 +-
 .../services_example_cxx/foo/CMakeLists.txt     |  2 +-
 examples/whiteboard/CMakeLists.txt              |  4 +--
 examples/whiteboard/publisherA/CMakeLists.txt   |  2 +-
 examples/whiteboard/publisherB/CMakeLists.txt   |  2 +-
 examples/whiteboard/tracker/CMakeLists.txt      |  2 +-
 .../whiteboard/tracker_depman/CMakeLists.txt    |  2 +-
 .../test_bundle1/CMakeLists.txt                 |  2 +-
 log_service/CMakeLists.txt                      |  4 +--
 log_writer/log_writer_stdout/CMakeLists.txt     |  4 +--
 log_writer/log_writer_syslog/CMakeLists.txt     |  4 +--
 pubsub/deploy/CMakeLists.txt                    | 22 ++++++++---------
 .../examples/mp_pubsub/publisher/CMakeLists.txt |  2 +-
 .../mp_pubsub/subscriber/CMakeLists.txt         |  2 +-
 pubsub/examples/pubsub/publisher/CMakeLists.txt |  2 +-
 .../examples/pubsub/publisher2/CMakeLists.txt   |  2 +-
 .../examples/pubsub/subscriber/CMakeLists.txt   |  2 +-
 pubsub/pubsub_admin_udp_mc/CMakeLists.txt       |  4 +--
 pubsub/pubsub_admin_zmq/CMakeLists.txt          |  4 +--
 pubsub/pubsub_discovery/CMakeLists.txt          |  4 +--
 pubsub/pubsub_serializer_json/CMakeLists.txt    |  4 +--
 pubsub/pubsub_topology_manager/CMakeLists.txt   |  4 +--
 pubsub/test/CMakeLists.txt                      | 12 ++++-----
 .../discovery_configured/CMakeLists.txt         |  4 +--
 remote_services/discovery_etcd/CMakeLists.txt   |  4 +--
 remote_services/discovery_shm/CMakeLists.txt    |  4 +--
 remote_services/examples/CMakeLists.txt         | 16 ++++++------
 .../examples/calculator_endpoint/CMakeLists.txt |  2 +-
 .../calculator_endpoint2/CMakeLists.txt         |  2 +-
 .../examples/calculator_proxy/CMakeLists.txt    |  2 +-
 .../examples/calculator_proxy2/CMakeLists.txt   |  2 +-
 .../examples/calculator_service/CMakeLists.txt  |  2 +-
 .../examples/calculator_shell/CMakeLists.txt    |  2 +-
 .../remote_service_admin_dfi/rsa/CMakeLists.txt |  4 +--
 .../rsa_tst/bundle/CMakeLists.txt               |  2 +-
 .../remote_service_admin_http/CMakeLists.txt    |  4 +--
 .../remote_service_admin_shm/CMakeLists.txt     |  4 +--
 remote_services/topology_manager/CMakeLists.txt |  4 +--
 .../tms_tst/bundle/CMakeLists.txt               |  2 +-
 .../tms_tst/disc_mock/CMakeLists.txt            |  2 +-
 remote_shell/CMakeLists.txt                     |  6 ++---
 shell/CMakeLists.txt                            |  4 +--
 shell_bonjour/CMakeLists.txt                    |  4 +--
 shell_tui/CMakeLists.txt                        |  4 +--
 87 files changed, 178 insertions(+), 183 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/cmake/cmake_celix/BundlePackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake
index f3adde3..7a126e9 100644
--- a/cmake/cmake_celix/BundlePackaging.cmake
+++ b/cmake/cmake_celix/BundlePackaging.cmake
@@ -89,7 +89,7 @@ function(check_bundle BUNDLE)
 endfunction()
 
 function(add_bundle)
-    #message(DEPRECATION"add_bundle is DEPRECATION, use add_celix_bundle instead.")
+    message(DEPRECATION "add_bundle is DEPRECATION, use add_celix_bundle instead.")
     add_celix_bundle(${ARGN})
 endfunction()
 function(add_celix_bundle)
@@ -228,7 +228,7 @@ function(add_celix_bundle)
     ################################
 
     if(BUNDLE_SOURCES) 
-        bundle_libs(${BUNDLE_TARGET_NAME} "PRIVATE" TRUE ${BUNDLE_TARGET_NAME})
+        celix_bundle_libs(${BUNDLE_TARGET_NAME} "PRIVATE" TRUE ${BUNDLE_TARGET_NAME})
         set_target_properties(${BUNDLE_TARGET_NAME} PROPERTIES "BUNDLE_ACTIVATOR" "$<TARGET_SONAME_FILE_NAME:${BUNDLE_TARGET_NAME}>")
         set_target_properties(${BUNDLE_TARGET_NAME} PROPERTIES "BUILD_WITH_INSTALL_RPATH" true)
 
@@ -261,7 +261,7 @@ function(add_celix_bundle)
 endfunction()
 
 function(bundle_export_libs)
-    #message(DEPRECATION"bundle_export_libs is DEPRECATION, use celix_bundle_export_libs instead.")
+    message(DEPRECATION "bundle_export_libs is DEPRECATION, use celix_bundle_export_libs instead.")
     celix_bundle_export_libs(${ARGN})
 endfunction()
 function(celix_bundle_export_libs)
@@ -271,7 +271,7 @@ function(celix_bundle_export_libs)
 endfunction()
 
 function(bundle_private_libs)
-    #message(DEPRECATION"bundle_private_libs is DEPRECATION, use celix_bundle_private_libs instead.")
+    message(DEPRECATION "bundle_private_libs is DEPRECATION, use celix_bundle_private_libs instead.")
     celix_bundle_private_libs(${ARGN})
 endfunction()
 function(celix_bundle_private_libs)
@@ -281,7 +281,7 @@ function(celix_bundle_private_libs)
 endfunction()
 
 function(bundle_libs)
-    #message(DEPRECATION"bundle_libs is DEPRECATION, use celix_bundle_libs instead.")
+    message(DEPRECATION "bundle_libs is DEPRECATION, use celix_bundle_libs instead.")
     celix_bundle_libs(${ARGN})
 endfunction()
 function(celix_bundle_libs)
@@ -348,7 +348,7 @@ function(celix_bundle_libs)
 endfunction()
 
 function(bundle_import_libs)
-    #message(DEPRECATION"bundle_import_libs is DEPRECATION, use celix_bundle_import_libs instead.")
+    message(DEPRECATION "bundle_import_libs is DEPRECATION, use celix_bundle_import_libs instead.")
     celix_bundle_import_libs(${ARGN})
 endfunction()
 function(celix_bundle_import_libs)
@@ -378,7 +378,7 @@ function(celix_bundle_import_libs)
 endfunction()
 
 function(bundle_files)
-    #message(DEPRECATION"bundle_files is DEPRECATION, use celix_bundle_files instead.")
+    message(DEPRECATION "bundle_files is DEPRECATION, use celix_bundle_files instead.")
     celix_bundle_files(${ARGN})
 endfunction()
 function(celix_bundle_files)
@@ -405,7 +405,7 @@ function(celix_bundle_files)
 endfunction()
 
 function(bundle_headers)
-    #message(DEPRECATION"bundle_headers is DEPRECATION, use celix_bundle_headers instead.")
+    message(DEPRECATION "bundle_headers is DEPRECATION, use celix_bundle_headers instead.")
     celix_bundle_headers(${ARGN})
 endfunction()
 function(celix_bundle_headers)
@@ -424,7 +424,7 @@ function(celix_bundle_headers)
 endfunction()
 
 function(bundle_symbolic_name)
-    #message(DEPRECATION"bundle_symbolic_name is DEPRECATION, use celix_bundle_symbolic_name instead.")
+    message(DEPRECATION "bundle_symbolic_name is DEPRECATION, use celix_bundle_symbolic_name instead.")
     celix_bundle_symbolic_name(${ARGN})
 endfunction()
 function(celix_bundle_symbolic_name BUNDLE SYMBOLIC_NAME)
@@ -432,7 +432,7 @@ function(celix_bundle_symbolic_name BUNDLE SYMBOLIC_NAME)
 endfunction()
 
 function(bundle_name)
-    #message(DEPRECATION"bundle_name is DEPRECATION, use celix_bundle_name instead.")
+    message(DEPRECATION "bundle_name is DEPRECATION, use celix_bundle_name instead.")
     celix_bundle_symbolic_name(${ARGN})
 endfunction()
 function(celix_bundle_name BUNDLE NAME)
@@ -440,7 +440,7 @@ function(celix_bundle_name BUNDLE NAME)
 endfunction()
 
 function(bundle_version)
-    #message(DEPRECATION"bundle_version is DEPRECATION, use celix_bundle_version instead.")
+    message(DEPRECATION "bundle_version is DEPRECATION, use celix_bundle_version instead.")
     celix_bundle_symbolic_name(${ARGN})
 endfunction()
 function(celix_bundle_version BUNDLE VERSION)
@@ -448,7 +448,7 @@ function(celix_bundle_version BUNDLE VERSION)
 endfunction()
 
 function(bundle_description)
-    #message(DEPRECATION"bundle_description is DEPRECATION, use celix_bundle_description instead.")
+    message(DEPRECATION "bundle_description is DEPRECATION, use celix_bundle_description instead.")
     celix_bundle_symbolic_name(${ARGN})
 endfunction()
 function(celix_bundle_description BUNDLE DESC)
@@ -456,7 +456,7 @@ function(celix_bundle_description BUNDLE DESC)
 endfunction()
 
 function(install_bundle)
-    #message(DEPRECATION"install_bundle is DEPRECATION, use install_celix_bundle instead.")
+    message(DEPRECATION "install_bundle is DEPRECATION, use install_celix_bundle instead.")
     install_celix_bundle(${ARGN})
 endfunction()
 function(install_celix_bundle)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/cmake/cmake_celix/DeployPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DeployPackaging.cmake b/cmake/cmake_celix/DeployPackaging.cmake
index 26f5c90..707201f 100644
--- a/cmake/cmake_celix/DeployPackaging.cmake
+++ b/cmake/cmake_celix/DeployPackaging.cmake
@@ -28,7 +28,7 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")
 #####
 
 function(add_deploy)
-    #message(DEPRECATION "add_deploy is depecrated, use add_celix_container instead.")
+    message(DEPRECATION "add_deploy is depecrated, use add_celix_container instead.")
     add_celix_container(${ARGN})
 endfunction()
 
@@ -221,7 +221,7 @@ endfunction()
 #NOTE can be used for drivers/proxies/endpoints bundle dirs
 
 function(deploy_bundles_dir)
-    #message(DEPRECATION "deploy_bundles_dir is depecrated, use celix_container_bundles_dir instead.")
+    message(DEPRECATION "deploy_bundles_dir is depecrated, use celix_container_bundles_dir instead.")
     celix_container_bundles_dir(${ARGN})
 endfunction()
 function(celix_container_bundles_dir)
@@ -265,7 +265,7 @@ function(celix_container_bundles_dir)
 endfunction()
 
 function(deploy_bundles)
-    #message(DEPRECATION "deploy_bundles is depecrated, use celix_container_bundles instead.")
+    message(DEPRECATION "deploy_bundles is depecrated, use celix_container_bundles instead.")
     celix_container_bundles(${ARGN})
 endfunction()
 function(celix_container_bundles)
@@ -303,7 +303,7 @@ function(celix_container_bundles)
 endfunction()
 
 function(deploy_properties)
-    #message(DEPRECATION "deploy_properties is depecrated, use celix_container_properties instead.")
+    message(DEPRECATION "deploy_properties is depecrated, use celix_container_properties instead.")
     celix_container_properties(${ARGN})
 endfunction()
 function(celix_container_properties)
@@ -322,7 +322,7 @@ function(celix_container_properties)
 endfunction()
 
 function(deploy_embedded_properties)
-    #message(DEPRECATION "deploy_embedded_properties is depecrated, use celix_container_embedded_properties instead.")
+    message(DEPRECATION "deploy_embedded_properties is depecrated, use celix_container_embedded_properties instead.")
     celix_container_embedded_properties(${ARGN})
 endfunction()
 function(celix_container_embedded_properties)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/config_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/config_admin/CMakeLists.txt b/config_admin/CMakeLists.txt
index 8087662..4beb3de 100644
--- a/config_admin/CMakeLists.txt
+++ b/config_admin/CMakeLists.txt
@@ -45,7 +45,7 @@ if (CONFIG_ADMIN)
    endif(ENABLE_TESTING)
 	
 
-   add_deploy(config_admin_deploy 
+   add_celix_container(config_admin_deploy
        NAME "config_admin"
        BUNDLES 
         config_admin 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/config_admin/config_admin_tst/example_test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/config_admin/config_admin_tst/example_test/CMakeLists.txt b/config_admin/config_admin_tst/example_test/CMakeLists.txt
index d4c4b3d..273ba5f 100644
--- a/config_admin/config_admin_tst/example_test/CMakeLists.txt
+++ b/config_admin/config_admin_tst/example_test/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/config_admin/service/public/include")
 include_directories("private/include")
 
-add_bundle(example_test
+add_celix_bundle(example_test
     VERSION 0.1.0
     SOURCES
 	private/src/activator

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/config_admin/config_admin_tst/example_test2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/config_admin/config_admin_tst/example_test2/CMakeLists.txt b/config_admin/config_admin_tst/example_test2/CMakeLists.txt
index d312673..8652f2d 100644
--- a/config_admin/config_admin_tst/example_test2/CMakeLists.txt
+++ b/config_admin/config_admin_tst/example_test2/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/config_admin/service/public/include")
 include_directories("private/include")
 
-add_bundle(example_test2 SOURCES
+add_celix_bundle(example_test2 SOURCES
 	private/src/activator
 	private/src/example_managed_service_impl
     VERSION 0.1.0

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/config_admin/example/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/config_admin/example/CMakeLists.txt b/config_admin/example/CMakeLists.txt
index c1c80bd..4c7fcef 100644
--- a/config_admin/example/CMakeLists.txt
+++ b/config_admin/example/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
     ../service/public/include
 )
 
-add_bundle(config_admin_example 
+add_celix_bundle(config_admin_example
 	VERSION 0.0.1
 	SOURCES
 		private/src/bundle_activator

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/config_admin/service/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/config_admin/service/CMakeLists.txt b/config_admin/service/CMakeLists.txt
index e194081..18289d0 100644
--- a/config_admin/service/CMakeLists.txt
+++ b/config_admin/service/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("public/include")
 include_directories("private/include")
  		
-add_bundle(config_admin 
+add_celix_bundle(config_admin
     VERSION 0.0.1
     SOURCES
 	private/src/activator 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/dependency_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager/CMakeLists.txt b/dependency_manager/CMakeLists.txt
index 931789a..952cfe7 100644
--- a/dependency_manager/CMakeLists.txt
+++ b/dependency_manager/CMakeLists.txt
@@ -30,7 +30,7 @@ if (DEPENDENCY_MANAGER)
       endif(CMAKE_UNAME)
     endif(UNIX AND NOT WIN32)
 
-    add_bundle(dm_shell
+    add_celix_bundle(dm_shell
         SYMBOLIC_NAME "apache_celix_dm_shell"
         VERSION "1.0.0"
         NAME "Apache Celix DM Shell Commands"
@@ -85,7 +85,7 @@ if (DEPENDENCY_MANAGER)
 		COMPONENT
 			dependency_manager
 	)
-    install_bundle(dm_shell)
+    install_celix_bundle(dm_shell)
     install(TARGETS dependency_manager_static DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dependency_manager)
     install(TARGETS dependency_manager_so DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dependency_manager)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/deployment_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt
index a6094ad..51fe2ba 100644
--- a/deployment_admin/CMakeLists.txt
+++ b/deployment_admin/CMakeLists.txt
@@ -29,7 +29,7 @@ if (DEPLOYMENT_ADMIN)
     include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/private/include")
     include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/public/include")
     
-    add_bundle(deployment_admin
+    add_celix_bundle(deployment_admin
         SYMBOLIC_NAME "apache_celix_deployment_admin"
         VERSION "0.0.2"
         NAME "Apache Celix Deployment Admin"
@@ -56,7 +56,7 @@ if (DEPLOYMENT_ADMIN)
     )
 
     
-    install_bundle(deployment_admin
+    install_celix_bundle(deployment_admin
     	HEADERS
     		public/include/resource_processor.h
 	)
@@ -64,7 +64,7 @@ if (DEPLOYMENT_ADMIN)
     target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
 
 
-    add_deploy(deployment-admin
+    add_celix_container(deployment-admin
         BUNDLES deployment_admin shell shell_tui log_service log_writer
         PROPERTIES
     		"deployment_admin_url=http://localhost:8080"

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/device_access/device_access/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/device_access/CMakeLists.txt b/device_access/device_access/CMakeLists.txt
index 9668156..52b8694 100644
--- a/device_access/device_access/CMakeLists.txt
+++ b/device_access/device_access/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(device_manager
+add_celix_bundle(device_manager
 	SYMBOLIC_NAME "apache_celix_device_manager"
 	VERSION "0.0.2"
 	NAME "Apache Celix Device Access Device Manager"
@@ -34,7 +34,7 @@ add_bundle(device_manager
 		private/include/driver_matcher.h
 )
 
-install_bundle(device_manager
+install_celix_bundle(device_manager
 	HEADERS
 		public/include/device.h
 		public/include/driver_locator.h

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/device_access/driver_locator/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/driver_locator/CMakeLists.txt b/device_access/driver_locator/CMakeLists.txt
index 9138f4a..88c1fed 100644
--- a/device_access/driver_locator/CMakeLists.txt
+++ b/device_access/driver_locator/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(driver_locator
+add_celix_bundle(driver_locator
 	SYMBOLIC_NAME "apache_celix_driver_locator"
 	VERSION "0.0.2"
 	NAME "Apache Celix Device Access Driver Locator"
@@ -24,7 +24,7 @@ add_bundle(driver_locator
 		private/src/driver_locator
 )
 
-install_bundle(driver_locator)
+install_celix_bundle(driver_locator)
 
 include_directories(${PROJECT_SOURCE_DIR}/device_access/device_access/public/include)
 include_directories(private/include)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/device_access/example/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/example/CMakeLists.txt b/device_access/example/CMakeLists.txt
index 1a5cd77..89b4f21 100644
--- a/device_access/example/CMakeLists.txt
+++ b/device_access/example/CMakeLists.txt
@@ -21,7 +21,7 @@ if(DEVICE_ACCESS_EXAMPLE)
 	add_subdirectory(consuming_driver)
 	add_subdirectory(refining_driver)
 
-    add_deploy(device_access_example
+    add_celix_container(device_access_example
         BUNDLES device_manager driver_locator shell shell_tui log_service base_driver
     )
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/device_access/example/base_driver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/example/base_driver/CMakeLists.txt b/device_access/example/base_driver/CMakeLists.txt
index c354d3b..ecc62df 100644
--- a/device_access/example/base_driver/CMakeLists.txt
+++ b/device_access/example/base_driver/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(base_driver
+add_celix_bundle(base_driver
  	SYMBOLIC_NAME "apache_celix_base_driver_example"
  	VERSION "0.0.1"
  	NAME "Apache Celix Device Access Base Driver Example"

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/device_access/example/consuming_driver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/example/consuming_driver/CMakeLists.txt b/device_access/example/consuming_driver/CMakeLists.txt
index 061d350..5bb6497 100644
--- a/device_access/example/consuming_driver/CMakeLists.txt
+++ b/device_access/example/consuming_driver/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(word_consumingdriver
+add_celix_bundle(word_consumingdriver
  	SYMBOLIC_NAME "apache_celix_word_consuming_driver_example"
  	VERSION "0.0.1"
  	NAME "Apache Celix Device Access Word Consuming Driver Example"

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/device_access/example/refining_driver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/example/refining_driver/CMakeLists.txt b/device_access/example/refining_driver/CMakeLists.txt
index d16584f..45aa5e4 100644
--- a/device_access/example/refining_driver/CMakeLists.txt
+++ b/device_access/example/refining_driver/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(char_refiningdriver
+add_celix_bundle(char_refiningdriver
  	SYMBOLIC_NAME "apache_celix_char_refining_driver_example"
  	NAME "Apache Celix Device Access Char Refining Driver Example"
  	VERSION "0.0.1"

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/documents/cmake_commands/readme.md
----------------------------------------------------------------------
diff --git a/documents/cmake_commands/readme.md b/documents/cmake_commands/readme.md
index 6de67e1..661f5cc 100644
--- a/documents/cmake_commands/readme.md
+++ b/documents/cmake_commands/readme.md
@@ -173,7 +173,7 @@ add_celix_container(<celix_container_name>
 ```
 
 The provided bundle targets for a celix container do not have to exists (yet).
-This removes the need for correctly ordering the add_bundle commands so that all bundle target are present before an add_celix_container command.
+This removes the need for correctly ordering the add_celix_bundle commands so that all bundle target are present before an add_celix_container command.
 If the bundle target is never added CMake will give an error:
 ```
   Error evaluating generator expression:
@@ -252,7 +252,7 @@ The add_celix_docker target is a executable target and can be used to link libra
 The docker dir can be found in `<cmake_build_dir>/docker[/<group_name>]/<docker_name>`. 
   
 The provided bundle targets for a docker dir do not have to exists (yet).
-This removes the need for correctly order the add_bundle commands so that all bundle target are present before 
+This removes the need for correctly order the add_celix_bundle commands so that all bundle target are present before 
 an `add_celix_docker` command.
 If the bundle target is never added CMake will give an error:
   ```

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/documents/getting_started/creating_a_simple_bundle.md
----------------------------------------------------------------------
diff --git a/documents/getting_started/creating_a_simple_bundle.md b/documents/getting_started/creating_a_simple_bundle.md
index d2f7d11..784e11c 100644
--- a/documents/getting_started/creating_a_simple_bundle.md
+++ b/documents/getting_started/creating_a_simple_bundle.md
@@ -88,7 +88,7 @@ And add the following CMakeLists.txt file for the C Bundle:
 ```CMake	
 #${WS}/myproject/bundles/hello_world/CMakeLists.txt
 
-add_bundle(hello_world
+add_celix_bundle(hello_world
     VERSION 1.0.0
 	SOURCES
         private/src/hello_world_activator.c
@@ -110,7 +110,7 @@ include_directories(
     private/include
 )
 
-add_bundle(HelloWorld
+add_celix_bundle(HelloWorld
     VERSION 1.0.0
 	SOURCES
         private/src/HelloWorldActivator.cc
@@ -124,7 +124,7 @@ endif()
 ```
 	
 These CMakeLists.txt files declare that the bundles should be build based on the build result (shared library) of the declared sources (in this case the `private/src/hello_world_activator.c` or `private/src/HelloWorldActivator.cc` source). 
-The add_bundle function is an Apache Celix specific CMake extension. 
+The `add_celix_bundle` CMake function is an Apache Celix specific CMake extension. 
 The library used for the bundle will also be linked against the dependency manager static library. 
 
 
@@ -222,9 +222,6 @@ mkdir myproject-build
 cd myproject-build
 cmake ../myproject
 make all  
-#Or
-#cmake -G Ninja ../myproject
-#ninja
 ```	
 
 Hopefully you will some some build results scrolling over the screen and actual build results in the build directory. There should be a hello_world.zip in the bundles/hello_world directory, this the actual bundle.  
@@ -234,11 +231,12 @@ A bundle on its own has no real value, so lets setup a deployment and run the Ap
 
 To create a deployment for the hello world bundles two things are needed: 
 	
-1. Add a `add_deploy` statement in the `CMakeLists.txt` file declaring what to deploy and under which name.
+1. Add a `add_celix_container` statement in the `CMakeLists.txt` file declaring what to deploy and under which name.
 
 ```CMake
 #${WS}/myproject/CMakeLists.txt
-add_deploy(myproject 
+add_celix_container(myproject
+    CXX 
     BUNDLES 
 	    ${CELIX_BUNDLES_DIR}/shell.zip 
 	    ${CELIX_BUNDLES_DIR}/shell_tui.zip
@@ -253,8 +251,6 @@ Rerun make again form the build project. the make files generated by CMake will
 ```bash 		
 cd ${WS}/myproject-build
 make -j
-#or
-#ninja
 ```	
 
 Now a deploy directory myproject should be available in the deploy directory. This directory contains - among other files - a release.sh script. This can be used to setup the required environment variables (like LD_LIBRARY_PATH).
@@ -262,8 +258,7 @@ Now a deploy directory myproject should be available in the deploy directory. Th
 ```bash
 cd ${WS}/myproject-build/deploy/myproject
 . ./release.sh
-celix
-#or ./hello
+./hello
 ```
 
 The hello_world bundle should be started with the famous "Hello World" text printed twice from the C and C++ bundle. The shell and shell_tui bundle are also deployed and these can be used to query and control the running framework. Below some commands are shown for querying the installed bundles, listing all known shell command, showing the help of a specific command and stopping a specific bundle (note that bundle 0 is the framework "bundle"):

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/event_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/event_admin/CMakeLists.txt b/event_admin/CMakeLists.txt
index e0d830c..2882069 100644
--- a/event_admin/CMakeLists.txt
+++ b/event_admin/CMakeLists.txt
@@ -27,16 +27,16 @@ if(EVENT_ADMIN)
   #  deploy("event_publisher_example" BUNDLES event_admin event_publisher shell shell_tui log_service log_writer)
 #	deploy("event_handler_example" BUNDLES event_admin event_handler shell shell_tui log_service log_writer)
 #	deploy("event_admin_example" BUNDLES event_admin event_publisher event_handler shell shell_tui log_service log_writer)
-	add_deploy(event_admin_service
+	add_celix_container(event_admin_service
 			NAME "event_admin_service"
 			GROUP "event_admin/event_admin"
 			BUNDLES event_admin shell shell_tui log_service log_writer
 			)
-	add_deploy(event_handler_consumer
+	add_celix_container(event_handler_consumer
 			NAME "event_handler_consumer"
 			GROUP "event_handler"
 			BUNDLES event_handler event_admin shell shell_tui log_service log_writer)
-	add_deploy(event_publisher_consumer
+	add_celix_container(event_publisher_consumer
 			NAME "event_publisher_consumer"
 			GROUP "event_publisher"
 			BUNDLES event_publisher event_handler event_admin shell shell_tui log_service log_writer)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/event_admin/event_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/event_admin/event_admin/CMakeLists.txt b/event_admin/event_admin/CMakeLists.txt
index 4fe7ccd..52b1120 100644
--- a/event_admin/event_admin/CMakeLists.txt
+++ b/event_admin/event_admin/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(private/include)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 
-add_bundle(event_admin
+add_celix_bundle(event_admin
     VERSION 0.0.0
 	SOURCES 
 		private/src/event_admin_activator.c
@@ -34,6 +34,6 @@ add_bundle(event_admin
 		${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
 )
 
-install_bundle(event_admin)
+install_celix_bundle(event_admin)
 
 target_link_libraries(event_admin celix_framework celix_utils)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/event_admin/event_handler/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/event_admin/event_handler/CMakeLists.txt b/event_admin/event_handler/CMakeLists.txt
index c786a78..fe2609c 100644
--- a/event_admin/event_handler/CMakeLists.txt
+++ b/event_admin/event_handler/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 
 
-add_bundle(event_handler
+add_celix_bundle(event_handler
     VERSION 0.0.0
 	SOURCES 
 		private/src/event_handler_activator.c
@@ -30,6 +30,6 @@ add_bundle(event_handler
 		${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
 )
 
-install_bundle(event_handler)
+install_celix_bundle(event_handler)
 
 target_link_libraries(event_handler celix_framework celix_utils)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/event_admin/event_publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/event_admin/event_publisher/CMakeLists.txt b/event_admin/event_publisher/CMakeLists.txt
index 1999a9c..01b7b10 100644
--- a/event_admin/event_publisher/CMakeLists.txt
+++ b/event_admin/event_publisher/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(private/include)
 include_directories(${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include)
 include_directories(${PROJECT_SOURCE_DIR}/log_service/public/include)
 
-add_bundle(event_publisher
+add_celix_bundle(event_publisher
     VERSION 0.0.0
 		SOURCES
 		private/src/event_publisher_activator.c
@@ -29,6 +29,6 @@ add_bundle(event_publisher
 		${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
 )
 
-install_bundle(event_publisher)
+install_celix_bundle(event_publisher)
 
 target_link_libraries(event_publisher celix_framework celix_utils)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example/CMakeLists.txt b/examples/dm_example/CMakeLists.txt
index fa6ec57..16a8ce1 100644
--- a/examples/dm_example/CMakeLists.txt
+++ b/examples/dm_example/CMakeLists.txt
@@ -27,7 +27,7 @@ if (BUILD_DEPENDENCY_MANAGER)
     add_subdirectory(phase3)
 
 
-    add_deploy("dm_example"
+    add_celix_container("dm_example"
         COPY 
         BUNDLES
             shell

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example/phase1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example/phase1/CMakeLists.txt b/examples/dm_example/phase1/CMakeLists.txt
index 99abe65..dabb88f 100644
--- a/examples/dm_example/phase1/CMakeLists.txt
+++ b/examples/dm_example/phase1/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../services
 )
 
-add_bundle(phase1
+add_celix_bundle(phase1
     SYMBOLIC_NAME phase1
     VERSION 0.0.1
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example/phase2a/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example/phase2a/CMakeLists.txt b/examples/dm_example/phase2a/CMakeLists.txt
index 31c27a6..0bd8e7e 100644
--- a/examples/dm_example/phase2a/CMakeLists.txt
+++ b/examples/dm_example/phase2a/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../services
 )
 
-add_bundle(phase2a
+add_celix_bundle(phase2a
         SYMBOLIC_NAME phase2a
         VERSION 0.0.1
         SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example/phase2b/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example/phase2b/CMakeLists.txt b/examples/dm_example/phase2b/CMakeLists.txt
index 1d107ec..775e786 100644
--- a/examples/dm_example/phase2b/CMakeLists.txt
+++ b/examples/dm_example/phase2b/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../services
 )
 
-add_bundle(phase2b
+add_celix_bundle(phase2b
         SYMBOLIC_NAME phase2b
         VERSION 0.0.1
         SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example/phase3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example/phase3/CMakeLists.txt b/examples/dm_example/phase3/CMakeLists.txt
index aea9f9e..163980f 100644
--- a/examples/dm_example/phase3/CMakeLists.txt
+++ b/examples/dm_example/phase3/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../services
 )
 
-add_bundle(phase3
+add_celix_bundle(phase3
         SYMBOLIC_NAME phase3
         VERSION 0.0.1
         SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example_cxx/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/CMakeLists.txt b/examples/dm_example_cxx/CMakeLists.txt
index b07f5cc..09b63ab 100644
--- a/examples/dm_example_cxx/CMakeLists.txt
+++ b/examples/dm_example_cxx/CMakeLists.txt
@@ -31,7 +31,7 @@ if (BUILD_DEPENDENCY_MANAGER_CXX)
     add_subdirectory(phase3_locking)
 
 
-    add_deploy("dm_example_cxx"
+    add_celix_container("dm_example_cxx"
         COPY 
         CXX
         BUNDLES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example_cxx/phase1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/phase1/CMakeLists.txt b/examples/dm_example_cxx/phase1/CMakeLists.txt
index 3c0544a..1a5d049 100644
--- a/examples/dm_example_cxx/phase1/CMakeLists.txt
+++ b/examples/dm_example_cxx/phase1/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../api
 )
 
-add_bundle(phase1_cxx
+add_celix_bundle(phase1_cxx
     SYMBOLIC_NAME phase1_cxx
     VERSION 0.0.1
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example_cxx/phase2a/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/phase2a/CMakeLists.txt b/examples/dm_example_cxx/phase2a/CMakeLists.txt
index 8528078..b2a625a 100644
--- a/examples/dm_example_cxx/phase2a/CMakeLists.txt
+++ b/examples/dm_example_cxx/phase2a/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../api
 )
 
-add_bundle(phase2a_cxx
+add_celix_bundle(phase2a_cxx
     SYMBOLIC_NAME phase2a_cxx
     VERSION 0.0.1
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example_cxx/phase2b/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/phase2b/CMakeLists.txt b/examples/dm_example_cxx/phase2b/CMakeLists.txt
index 29ff664..ba93f45 100644
--- a/examples/dm_example_cxx/phase2b/CMakeLists.txt
+++ b/examples/dm_example_cxx/phase2b/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
         ../api
 )
 
-add_bundle(phase2b_cxx
+add_celix_bundle(phase2b_cxx
     SYMBOLIC_NAME phase2b_cxx
     VERSION 0.0.1
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example_cxx/phase3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/phase3/CMakeLists.txt b/examples/dm_example_cxx/phase3/CMakeLists.txt
index 99c3a5b..3c23582 100644
--- a/examples/dm_example_cxx/phase3/CMakeLists.txt
+++ b/examples/dm_example_cxx/phase3/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../api
 )
 
-add_bundle(phase3_cxx
+add_celix_bundle(phase3_cxx
     SYMBOLIC_NAME phase3_cxx
     VERSION 0.0.1
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/dm_example_cxx/phase3_locking/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/phase3_locking/CMakeLists.txt b/examples/dm_example_cxx/phase3_locking/CMakeLists.txt
index 07c9b54..ef10a33 100644
--- a/examples/dm_example_cxx/phase3_locking/CMakeLists.txt
+++ b/examples/dm_example_cxx/phase3_locking/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
         ../api
 )
 
-add_bundle(phase3_locking_cxx
+add_celix_bundle(phase3_locking_cxx
     SYMBOLIC_NAME phase3_locking_cxx
     VERSION 0.0.1
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/hello_world/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/hello_world/CMakeLists.txt b/examples/hello_world/CMakeLists.txt
index 0ed7ed6..e90149e 100644
--- a/examples/hello_world/CMakeLists.txt
+++ b/examples/hello_world/CMakeLists.txt
@@ -32,29 +32,29 @@ add_library(hello_test2lib SHARED
 )
 set_library_version(hello_test2lib "3.3.3")
 
-add_bundle(hello
+add_celix_bundle(hello
     VERSION "1.2"
     SOURCES
         private/src/activator.c
     IMPORT_LIBRARIES hello_test2lib
 )
 
-add_bundle(hello_export
+add_celix_bundle(hello_export
     VERSION "1.0"
     NO_ACTIVATOR
     EXPORT_LIBRARIES hello_test2lib
 )
 
-bundle_private_libs(hello
+celix_bundle_private_libs(hello
     hello_testlib
 )
 
-add_deploy(helloworld_byref
+add_celix_container(helloworld_byref
     GROUP hello
     BUNDLES hello_export hello shell shell_tui
 )
 
-add_deploy(helloworld_withcopy
+add_celix_container(helloworld_withcopy
     GROUP hello
     COPY #Ensures that bundles are copied in the deploy location
     BUNDLES hello_export hello shell shell_tui

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/hello_world_test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/hello_world_test/CMakeLists.txt b/examples/hello_world_test/CMakeLists.txt
index 39198ed..2d146fc 100644
--- a/examples/hello_world_test/CMakeLists.txt
+++ b/examples/hello_world_test/CMakeLists.txt
@@ -16,19 +16,19 @@
 # under the License.
 
 #############################################################################
-## NOTE Examples of using add_bundle and add_deploy and assorted commands ##
+## NOTE Examples of using add_celix_bundle and add_celix_container and assorted commands ##
 #############################################################################
 
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories(public/include)
 
-add_bundle(hellotest1
+add_celix_bundle(hellotest1
     VERSION "1.2"
     SOURCES
         private/src/activator
 )
 
-bundle_headers(hellotest1
+celix_bundle_headers(hellotest1
     "X-WebContent: web"
     "X-MediaType: application/json"
 )
@@ -42,20 +42,20 @@ set_library_version(tlib "4.3.2") # sets target propery VERSION to 4.3.2 and SOV
 #    #/usr/local/lib/libjansson.4.dylib
 #    /usr/lib64/libjansson.so.4
 #)
-bundle_private_libs(hellotest1
+celix_bundle_private_libs(hellotest1
     tlib
     #/usr/lib/libcurl.4.dylib 
     #    /usr/lib64/libcurl.so.4
 )
 
 
-add_deploy(hello_test_deploy
+add_celix_container(hello_test_deploy
     BUNDLES hellotest1 hellotest2 #NOTE hellotest2 is still a unknown target
     PROPERTIES 
         "Test=true"
 )
 
-#add_deploy(hello_test_deploy_fail
+#add_celix_container(hello_test_deploy_fail
 #    BUNDLES nonexisting
 #)
 
@@ -72,12 +72,12 @@ add_library(hello2act SHARED
     private/src/activator
 )
 set_library_version(hello2act "3.2.4") #sets VERSION prop to 3.2.4 and SOVERSION to 3
-add_bundle(hellotest2
+add_celix_bundle(hellotest2
     VERSION "1.0.0" #can be the same as activator lib, but does not have to be
     ACTIVATOR hello2act
 )
 
-#add_bundle(hellotest3
+#add_celix_bundle(hellotest3
 #    VERSION "2.1.2"
     #ACTIVATOR /usr/local/lib/libjansson.4.dylib
     #ACTIVATOR /usr/lib64/libjansson.so.4

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/log_service_example/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/log_service_example/CMakeLists.txt b/examples/log_service_example/CMakeLists.txt
index 6b7e681..fffa68f 100644
--- a/examples/log_service_example/CMakeLists.txt
+++ b/examples/log_service_example/CMakeLists.txt
@@ -21,14 +21,14 @@ include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("public/include")
 include_directories("${CMAKE_SOURCE_DIR}/log_service/public/include")
 
-add_bundle(log_service_example
+add_celix_bundle(log_service_example
     VERSION "1.0"
     SOURCES
         private/src/activator.c
         ${CMAKE_SOURCE_DIR}/log_service/public/src/log_helper.c
 )
 
-add_deploy(log_example
+add_celix_container(log_example
     GROUP log_service
     BUNDLES log_service_example log_service shell shell_tui
 )

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/mongoose/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/mongoose/CMakeLists.txt b/examples/mongoose/CMakeLists.txt
index f4250ef..2de051f 100644
--- a/examples/mongoose/CMakeLists.txt
+++ b/examples/mongoose/CMakeLists.txt
@@ -28,15 +28,15 @@ if(WIN32)
 	  set(LIBS wsock32)
 endif(WIN32)
 
-add_bundle(mongoose
+add_celix_bundle(mongoose
     VERSION 0.0.1
     SOURCES
         private/src/activator
         private/include/mongoose.h
 )
 
-bundle_files(mongoose ${CMAKE_CURRENT_LIST_DIR}/root)
+celix_bundle_files(mongoose ${CMAKE_CURRENT_LIST_DIR}/root)
 
 target_link_libraries(mongoose celix_framework mongooselib ${LIBS})
 
-add_deploy("mongoose_deploy" BUNDLES shell shell_tui log_service mongoose)
+add_celix_container("mongoose_deploy" BUNDLES shell shell_tui log_service mongoose)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/service_hook_example/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/service_hook_example/CMakeLists.txt b/examples/service_hook_example/CMakeLists.txt
index 8835a85..8348059 100644
--- a/examples/service_hook_example/CMakeLists.txt
+++ b/examples/service_hook_example/CMakeLists.txt
@@ -21,14 +21,14 @@ if(NOT APPLE)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("public/include")
 
-add_bundle(hook_example
+add_celix_bundle(hook_example
            BUNDLE_SYMBOLICNAME "Hook_Example"
            VERSION "1.0.0"
            SOURCES
                 private/src/activator
 )
 
-add_deploy("hook_service_example"
+add_celix_container("hook_service_example"
             BUNDLES
                 shell
                 shell_tui

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_c/CMakeLists.txt b/examples/services_example_c/CMakeLists.txt
index f6a5066..3fe4a12 100644
--- a/examples/services_example_c/CMakeLists.txt
+++ b/examples/services_example_c/CMakeLists.txt
@@ -26,7 +26,7 @@ if (BUILD_DEPENDENCY_MANAGER)
     add_subdirectory(foo2)
     add_subdirectory(bar)
 
-    add_deploy(services_example_c
+    add_celix_container(services_example_c
         GROUP services_example
         COPY
         BUNDLES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_c/bar/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_c/bar/CMakeLists.txt b/examples/services_example_c/bar/CMakeLists.txt
index 7ebb45c..47c544d 100644
--- a/examples/services_example_c/bar/CMakeLists.txt
+++ b/examples/services_example_c/bar/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
         private/include
 )
 
-add_bundle(bar
+add_celix_bundle(bar
     SYMBOLIC_NAME bar
     VERSION 1.0.0
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_c/foo1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_c/foo1/CMakeLists.txt b/examples/services_example_c/foo1/CMakeLists.txt
index 0d1b93c..eee5720 100644
--- a/examples/services_example_c/foo1/CMakeLists.txt
+++ b/examples/services_example_c/foo1/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
         private/include
 )
 
-add_bundle(foo1
+add_celix_bundle(foo1
     SYMBOLIC_NAME foo1
     VERSION 1.0.0
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_c/foo2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_c/foo2/CMakeLists.txt b/examples/services_example_c/foo2/CMakeLists.txt
index 1096c6c..54f4756 100644
--- a/examples/services_example_c/foo2/CMakeLists.txt
+++ b/examples/services_example_c/foo2/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
         private/include
 )
 
-add_bundle(foo2
+add_celix_bundle(foo2
     SYMBOLIC_NAME foo2
     VERSION 1.0.0
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_cxx/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_cxx/CMakeLists.txt b/examples/services_example_cxx/CMakeLists.txt
index 6f45ef7..bd94983 100644
--- a/examples/services_example_cxx/CMakeLists.txt
+++ b/examples/services_example_cxx/CMakeLists.txt
@@ -26,7 +26,7 @@ if (BUILD_DEPENDENCY_MANAGER_CXX)
     add_subdirectory(foo)
     add_subdirectory(baz)
 
-    add_deploy(services_example_cxx
+    add_celix_container(services_example_cxx
         GROUP services_example
         COPY
         BUNDLES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_cxx/bar/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_cxx/bar/CMakeLists.txt b/examples/services_example_cxx/bar/CMakeLists.txt
index b3cdb07..c6c1441 100644
--- a/examples/services_example_cxx/bar/CMakeLists.txt
+++ b/examples/services_example_cxx/bar/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
         private/include
 )
 
-add_bundle(bar_cxx
+add_celix_bundle(bar_cxx
     SYMBOLIC_NAME Bar
     VERSION 1.0.0
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_cxx/baz/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_cxx/baz/CMakeLists.txt b/examples/services_example_cxx/baz/CMakeLists.txt
index 205c716..1f15ae4 100644
--- a/examples/services_example_cxx/baz/CMakeLists.txt
+++ b/examples/services_example_cxx/baz/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
         private/include
 )
 
-add_bundle(baz_cxx
+add_celix_bundle(baz_cxx
     SYMBOLIC_NAME Baz
     VERSION 1.0.0
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/services_example_cxx/foo/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/services_example_cxx/foo/CMakeLists.txt b/examples/services_example_cxx/foo/CMakeLists.txt
index e01af00..3feddaf 100644
--- a/examples/services_example_cxx/foo/CMakeLists.txt
+++ b/examples/services_example_cxx/foo/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(
         private/include
 )
 
-add_bundle(foo_cxx
+add_celix_bundle(foo_cxx
     SYMBOLIC_NAME Foo
     VERSION 1.0.0
     SOURCES

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/whiteboard/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/whiteboard/CMakeLists.txt b/examples/whiteboard/CMakeLists.txt
index b904241..b81d299 100644
--- a/examples/whiteboard/CMakeLists.txt
+++ b/examples/whiteboard/CMakeLists.txt
@@ -20,5 +20,5 @@ add_subdirectory(publisherB)
 add_subdirectory(tracker)
 add_subdirectory(tracker_depman)
 
-add_deploy("whiteboard" GROUP whiteboard BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
-add_deploy("whiteboard_dependency_manager" GROUP whiteboard BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service log_writer dm_shell)
\ No newline at end of file
+add_celix_container("whiteboard" GROUP whiteboard BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
+add_celix_container("whiteboard_dependency_manager" GROUP whiteboard BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service log_writer dm_shell)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/whiteboard/publisherA/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/whiteboard/publisherA/CMakeLists.txt b/examples/whiteboard/publisherA/CMakeLists.txt
index a219360..5e18149 100644
--- a/examples/whiteboard/publisherA/CMakeLists.txt
+++ b/examples/whiteboard/publisherA/CMakeLists.txt
@@ -16,7 +16,7 @@
 # under the License.
 
 
-add_bundle(publisherA VERSION 1.0.0 SOURCES private/src/activator private/src/publisher)
+add_celix_bundle(publisherA VERSION 1.0.0 SOURCES private/src/activator private/src/publisher)
 include_directories("../publisherService/public/include")
 include_directories("../publisherService/private/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/whiteboard/publisherB/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/whiteboard/publisherB/CMakeLists.txt b/examples/whiteboard/publisherB/CMakeLists.txt
index 74f0bb5..13a8ac8 100644
--- a/examples/whiteboard/publisherB/CMakeLists.txt
+++ b/examples/whiteboard/publisherB/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(publisherB VERSION 1.0.0 SOURCES private/src/activator private/src/publisher)
+add_celix_bundle(publisherB VERSION 1.0.0 SOURCES private/src/activator private/src/publisher)
 include_directories("../publisherService/public/include")
 include_directories("../publisherService/private/include")
 target_link_libraries(publisherB celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/whiteboard/tracker/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/whiteboard/tracker/CMakeLists.txt b/examples/whiteboard/tracker/CMakeLists.txt
index c44b206..643fff6 100644
--- a/examples/whiteboard/tracker/CMakeLists.txt
+++ b/examples/whiteboard/tracker/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(tracker VERSION 1.0.0 SOURCES private/src/activator)
+add_celix_bundle(tracker VERSION 1.0.0 SOURCES private/src/activator)
 include_directories("../publisherService/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(tracker celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/examples/whiteboard/tracker_depman/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/whiteboard/tracker_depman/CMakeLists.txt b/examples/whiteboard/tracker_depman/CMakeLists.txt
index 3bd5942..fb31458 100644
--- a/examples/whiteboard/tracker_depman/CMakeLists.txt
+++ b/examples/whiteboard/tracker_depman/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(tracker_depman VERSION 1.0.0 SOURCES
+add_celix_bundle(tracker_depman VERSION 1.0.0 SOURCES
     private/src/dependency_activator
     private/src/tracker
     

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/framework/private/integration-test/test_bundle1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/framework/private/integration-test/test_bundle1/CMakeLists.txt b/framework/private/integration-test/test_bundle1/CMakeLists.txt
index a8d9d53..c766b06 100644
--- a/framework/private/integration-test/test_bundle1/CMakeLists.txt
+++ b/framework/private/integration-test/test_bundle1/CMakeLists.txt
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(test_bundle1 SOURCES src/activator VERSION 0.0.1)
+add_celix_bundle(test_bundle1 SOURCES src/activator VERSION 0.0.1)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(test_bundle1 celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/log_service/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_service/CMakeLists.txt b/log_service/CMakeLists.txt
index 131a986..856e21d 100644
--- a/log_service/CMakeLists.txt
+++ b/log_service/CMakeLists.txt
@@ -18,7 +18,7 @@
 celix_subproject(LOG_SERVICE "Option to enable building the Log Service bundles" ON DEPS framework)
 if (LOG_SERVICE)
 
-    add_bundle(log_service
+    add_celix_bundle(log_service
     	SYMBOLIC_NAME "apache_celix_log_service"
     	NAME "Apache Celix Log Service"
     	VERSION "1.1.0"
@@ -36,7 +36,7 @@ if (LOG_SERVICE)
 		    private/include/log_service_impl.h
     )
     
-    install_bundle(log_service
+    install_celix_bundle(log_service
         HEADERS
         	public/include/log_service.h
         	public/include/log_reader_service.h

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/log_writer/log_writer_stdout/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_writer/log_writer_stdout/CMakeLists.txt b/log_writer/log_writer_stdout/CMakeLists.txt
index 7874e96..6502792 100644
--- a/log_writer/log_writer_stdout/CMakeLists.txt
+++ b/log_writer/log_writer_stdout/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_bundle(log_writer
+add_celix_bundle(log_writer
 	SYMBOLIC_NAME "apache_celix_log_writer"
 	VERSION "1.1.0"
 	NAME "Apache Celix Log Writer"
@@ -27,7 +27,7 @@ add_bundle(log_writer
 		private/src/log_writer_stdout
 )
 
-install_bundle(log_writer)
+install_celix_bundle(log_writer)
     
 target_link_libraries(log_writer celix_framework)
     

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/log_writer/log_writer_syslog/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_writer/log_writer_syslog/CMakeLists.txt b/log_writer/log_writer_syslog/CMakeLists.txt
index 12130cf..faa7905 100644
--- a/log_writer/log_writer_syslog/CMakeLists.txt
+++ b/log_writer/log_writer_syslog/CMakeLists.txt
@@ -18,7 +18,7 @@ celix_subproject(LOG_WRITER_SYSLOG "Option to enable building the Syslog Writer"
 if (LOG_WRITER_SYSLOG)
     find_package(Syslog REQUIRED)
 
-    add_bundle(log_writer_syslog 
+    add_celix_bundle(log_writer_syslog
         VERSION 1.1.0
         SYMBOLIC_NAME "apache_celix_log_writer_syslog"
         NAME "Apache Celix Log Writer Syslog"
@@ -30,7 +30,7 @@ if (LOG_WRITER_SYSLOG)
         private/src/log_writer_syslog
     )
 
-    install_bundle(log_writer_syslog)
+    install_celix_bundle(log_writer_syslog)
         
     target_link_libraries(log_writer_syslog celix_framework)
         

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/deploy/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/deploy/CMakeLists.txt b/pubsub/deploy/CMakeLists.txt
index ddce160..f73857b 100644
--- a/pubsub/deploy/CMakeLists.txt
+++ b/pubsub/deploy/CMakeLists.txt
@@ -19,7 +19,7 @@ find_program(ETCD_CMD NAMES etcd)
 find_program(XTERM_CMD NAMES xterm)
 
 # UDP Multicast
-add_deploy(pubsub_publisher_udp_mc
+add_celix_container(pubsub_publisher_udp_mc
 	GROUP pubsub
 	BUNDLES
 	   shell
@@ -33,7 +33,7 @@ add_deploy(pubsub_publisher_udp_mc
 )
 target_link_libraries(pubsub_publisher_udp_mc PRIVATE celix_framework celix_utils celix_dfi)
 
-add_deploy("pubsub_subscriber_udp_mc"
+add_celix_container("pubsub_subscriber_udp_mc"
 	GROUP "pubsub"
 	BUNDLES
 	   shell
@@ -46,7 +46,7 @@ add_deploy("pubsub_subscriber_udp_mc"
 )
 target_link_libraries(pubsub_subscriber_udp_mc PRIVATE celix_framework celix_utils celix_dfi)
 
-add_deploy("pubsub_subscriber2_udp_mc"
+add_celix_container("pubsub_subscriber2_udp_mc"
 	GROUP "pubsub"
 	BUNDLES
 	   shell
@@ -77,7 +77,7 @@ endif ()
 if (BUILD_PUBSUB_PSA_ZMQ)
 
 	# Dynamic ZMQ / UDP admin
-	add_deploy("pubsub_publisher"
+	add_celix_container("pubsub_publisher"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -95,7 +95,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	)
 	target_link_libraries(pubsub_publisher PRIVATE celix_framework celix_utils celix_dfi)
 
-	add_deploy("pubsub_subscriber"
+	add_celix_container("pubsub_subscriber"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -113,7 +113,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	target_link_libraries(pubsub_subscriber PRIVATE celix_framework celix_utils celix_dfi)
 
 	# ZMQ
-	add_deploy("pubsub_zmq"
+	add_celix_container("pubsub_zmq"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -127,7 +127,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	)
 	target_link_libraries(pubsub_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
-	add_deploy("pubsub_publisher_zmq"
+	add_celix_container("pubsub_publisher_zmq"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -143,7 +143,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	)
 	target_link_libraries(pubsub_publisher_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
-	add_deploy("pubsub_subscriber_zmq"
+	add_celix_container("pubsub_subscriber_zmq"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -156,7 +156,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	)
 	target_link_libraries(pubsub_subscriber_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
-	add_deploy("pubsub_subscriber2_zmq"
+	add_celix_container("pubsub_subscriber2_zmq"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -170,7 +170,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	target_link_libraries(pubsub_subscriber2_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	# ZMQ Multipart
-	add_deploy("pubsub_mp_subscriber_zmq"
+	add_celix_container("pubsub_mp_subscriber_zmq"
 	    GROUP "pubsub"
 	    BUNDLES
 	       shell
@@ -183,7 +183,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	)
 	target_link_libraries(pubsub_mp_subscriber_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
-	add_deploy("pubsub_mp_publisher_zmq"
+	add_celix_container("pubsub_mp_publisher_zmq"
 	    GROUP "pubsub"
 	    BUNDLES
 	   		shell

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt b/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
index 76a01f1..d2bd754 100644
--- a/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
+++ b/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/common/include")
 
-add_bundle(org.apache.celix.pubsub_publisher.MpPublisher
+add_celix_bundle(org.apache.celix.pubsub_publisher.MpPublisher
     SYMBOLIC_NAME "apache_celix_pubsub_mp_publisher"
     VERSION "1.0.0"
     SOURCES 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt b/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
index a480a73..32258a8 100644
--- a/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
+++ b/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/common/include")
 
-add_bundle( org.apache.celix.pubsub_subscriber.MpSubscriber
+add_celix_bundle( org.apache.celix.pubsub_subscriber.MpSubscriber
     SYMBOLIC_NAME "apache_celix_pubsub_mp_subscriber"
     VERSION "1.0.0"
     SOURCES 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/examples/pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/publisher/CMakeLists.txt b/pubsub/examples/pubsub/publisher/CMakeLists.txt
index e35c137..2f7d671 100644
--- a/pubsub/examples/pubsub/publisher/CMakeLists.txt
+++ b/pubsub/examples/pubsub/publisher/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 
-add_bundle(org.apache.celix.pubsub_publisher.PoiPublisher
+add_celix_bundle(org.apache.celix.pubsub_publisher.PoiPublisher
     SYMBOLIC_NAME "apache_celix_pubsub_poi_publisher"
     VERSION "1.0.0"
     SOURCES 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/examples/pubsub/publisher2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/publisher2/CMakeLists.txt b/pubsub/examples/pubsub/publisher2/CMakeLists.txt
index b83f7dd..c03ac64 100644
--- a/pubsub/examples/pubsub/publisher2/CMakeLists.txt
+++ b/pubsub/examples/pubsub/publisher2/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 
-add_bundle(org.apache.celix.pubsub_publisher.PoiPublisher2
+add_celix_bundle(org.apache.celix.pubsub_publisher.PoiPublisher2
     SYMBOLIC_NAME "apache_celix_pubsub_poi_publisher2"
     VERSION "1.0.0"
     SOURCES 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/examples/pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/examples/pubsub/subscriber/CMakeLists.txt b/pubsub/examples/pubsub/subscriber/CMakeLists.txt
index 7fd9fae..7f28dfe 100644
--- a/pubsub/examples/pubsub/subscriber/CMakeLists.txt
+++ b/pubsub/examples/pubsub/subscriber/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/common/include")
 
-add_bundle(org.apache.celix.pubsub_subscriber.PoiSubscriber
+add_celix_bundle(org.apache.celix.pubsub_subscriber.PoiSubscriber
     SYMBOLIC_NAME "apache_celix_pubsub_poi_subscriber" 
     VERSION "1.0.0"
     SOURCES 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/CMakeLists.txt b/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
index 3ab0c54..fdf43ac 100644
--- a/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
+++ b/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories("private/include")
 include_directories("public/include")
 include_directories("${JANSSON_INCLUDE_DIR}")
 
-add_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc
+add_celix_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc
 	BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_udp_multicast"
 	VERSION "1.0.0"
 	SOURCES
@@ -44,6 +44,6 @@ add_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc
 set_target_properties(org.apache.celix.pubsub_admin.PubSubAdminUdpMc PROPERTIES INSTALL_RPATH "$ORIGIN")
 target_link_libraries(org.apache.celix.pubsub_admin.PubSubAdminUdpMc celix_framework celix_utils celix_dfi)
 
-install_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc)
+install_celix_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc)
 
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/pubsub_admin_zmq/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_zmq/CMakeLists.txt b/pubsub/pubsub_admin_zmq/CMakeLists.txt
index ab250f9..962310e 100644
--- a/pubsub/pubsub_admin_zmq/CMakeLists.txt
+++ b/pubsub/pubsub_admin_zmq/CMakeLists.txt
@@ -41,7 +41,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 		set (ZMQ_CRYPTO_C "private/src/zmq_crypto.c")
 	endif()
 
-	add_bundle(org.apache.celix.pubsub_admin.PubSubAdminZmq
+	add_celix_bundle(org.apache.celix.pubsub_admin.PubSubAdminZmq
 	    BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_zmq"
 	    VERSION "1.0.0"
 	    SOURCES
@@ -58,6 +58,6 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 
 	set_target_properties(org.apache.celix.pubsub_admin.PubSubAdminZmq PROPERTIES INSTALL_RPATH "$ORIGIN")
 	target_link_libraries(org.apache.celix.pubsub_admin.PubSubAdminZmq celix_framework celix_utils celix_dfi ${ZMQ_LIBRARIES} ${CZMQ_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY})
-	install_bundle(org.apache.celix.pubsub_admin.PubSubAdminZmq)
+	install_celix_bundle(org.apache.celix.pubsub_admin.PubSubAdminZmq)
 
 endif()

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/pubsub_discovery/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_discovery/CMakeLists.txt b/pubsub/pubsub_discovery/CMakeLists.txt
index 948da3e..42017e7 100644
--- a/pubsub/pubsub_discovery/CMakeLists.txt
+++ b/pubsub/pubsub_discovery/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories("${PROJECT_SOURCE_DIR}/etcdlib/public/include")
 include_directories("private/include")
 include_directories("public/include")
 
-add_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery
+add_celix_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery
     BUNDLE_SYMBOLICNAME "apache_celix_pubsub_discovery_etcd"
     VERSION "1.0.0"
     SOURCES
@@ -40,4 +40,4 @@ add_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery
 )
 
 target_link_libraries(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery celix_framework celix_utils etcdlib_static ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
-install_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery)
+install_celix_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/pubsub_serializer_json/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_serializer_json/CMakeLists.txt b/pubsub/pubsub_serializer_json/CMakeLists.txt
index 147873a..2aaa98a 100644
--- a/pubsub/pubsub_serializer_json/CMakeLists.txt
+++ b/pubsub/pubsub_serializer_json/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories("${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 include_directories("${JANSSON_INCLUDE_DIR}")
 
-add_bundle(org.apache.celix.pubsub_serializer.PubSubSerializerJson
+add_celix_bundle(org.apache.celix.pubsub_serializer.PubSubSerializerJson
     BUNDLE_SYMBOLICNAME "apache_celix_pubsub_serializer_json"
     VERSION "1.0.0"
     SOURCES
@@ -39,5 +39,5 @@ add_bundle(org.apache.celix.pubsub_serializer.PubSubSerializerJson
 set_target_properties(org.apache.celix.pubsub_serializer.PubSubSerializerJson PROPERTIES INSTALL_RPATH "$ORIGIN")
 target_link_libraries(org.apache.celix.pubsub_serializer.PubSubSerializerJson celix_framework celix_utils celix_dfi ${JANSSON_LIBRARIES})
 
-install_bundle(org.apache.celix.pubsub_serializer.PubSubSerializerJson)
+install_celix_bundle(org.apache.celix.pubsub_serializer.PubSubSerializerJson)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/pubsub_topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_topology_manager/CMakeLists.txt b/pubsub/pubsub_topology_manager/CMakeLists.txt
index b6eb796..680673b 100644
--- a/pubsub/pubsub_topology_manager/CMakeLists.txt
+++ b/pubsub/pubsub_topology_manager/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories("${PROJECT_SOURCE_DIR}/pubsub/api/pubsub")
 include_directories("private/include")
 include_directories("public/include")
 
-add_bundle(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
+add_celix_bundle(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
     BUNDLE_SYMBOLICNAME "apache_celix_pubsub_topology_manager"
     VERSION "1.0.0"
     SOURCES
@@ -40,5 +40,5 @@ bundle_files(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
 )
 
 target_link_libraries(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager celix_framework celix_utils)
-install_bundle(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager)
+install_celix_bundle(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/pubsub/test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/test/CMakeLists.txt b/pubsub/test/CMakeLists.txt
index 8279c0c..4150b3e 100644
--- a/pubsub/test/CMakeLists.txt
+++ b/pubsub/test/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
         test
 )
 
-add_bundle(pubsub_sut
+add_celix_bundle(pubsub_sut
     #"Vanilla" bundle which is under test
     SOURCES
         test/sut_activator.c
@@ -37,7 +37,7 @@ bundle_files(pubsub_sut
     msg_descriptors/sync.descriptor
     DESTINATION "META-INF/descriptors/messages"
 )
-add_deploy(pubsub_udpmc_sut
+add_celix_container(pubsub_udpmc_sut
     NAME deploy_sut
     BUNDLES
         org.apache.celix.pubsub_serializer.PubSubSerializerJson
@@ -47,7 +47,7 @@ add_deploy(pubsub_udpmc_sut
         pubsub_sut
     DIR ${PROJECT_BINARY_DIR}/runtimes/test/pubsub/udpmc
 )
-add_deploy(pubsub_zmq_sut
+add_celix_container(pubsub_zmq_sut
     NAME deploy_sut
     BUNDLES
         org.apache.celix.pubsub_serializer.PubSubSerializerJson
@@ -58,7 +58,7 @@ add_deploy(pubsub_zmq_sut
     DIR ${PROJECT_BINARY_DIR}/runtimes/test/pubsub/zmq
 )
 
-add_bundle(pubsub_tst
+add_celix_bundle(pubsub_tst
     #Test bundle containing cpputests and uses celix_test_runner launcher instead of the celix launcher
     SOURCES
         test/tst_activator.cpp
@@ -76,7 +76,7 @@ bundle_files(pubsub_tst
     msg_descriptors/sync.descriptor
     DESTINATION "META-INF/descriptors/messages"
 )
-add_deploy(pubsub_udpmc_tst
+add_celix_container(pubsub_udpmc_tst
     NAME deploy_tst
     BUNDLES
         org.apache.celix.pubsub_serializer.PubSubSerializerJson
@@ -88,7 +88,7 @@ add_deploy(pubsub_udpmc_tst
     DIR ${PROJECT_BINARY_DIR}/runtimes/test/pubsub/udpmc
     LAUNCHER celix_test_runner
 )
-add_deploy(pubsub_zmq_tst
+add_celix_container(pubsub_zmq_tst
     NAME deploy_tst
     BUNDLES
         org.apache.celix.pubsub_serializer.PubSubSerializerJson

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/discovery_configured/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_configured/CMakeLists.txt b/remote_services/discovery_configured/CMakeLists.txt
index edbbc13..c3180ad 100644
--- a/remote_services/discovery_configured/CMakeLists.txt
+++ b/remote_services/discovery_configured/CMakeLists.txt
@@ -31,7 +31,7 @@ if (RSA_DISCOVERY_CONFIGURED)
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
     include_directories(private/include)
 
-    add_bundle(discovery_configured 
+    add_celix_bundle(discovery_configured
     VERSION 0.9.0
     SYMBOLIC_NAME "apache_celix_rsa_discovery_configured"
     NAME "Apache Celix RSA Configured Discovery"    
@@ -50,7 +50,7 @@ if (RSA_DISCOVERY_CONFIGURED)
 	${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
     )
 
-    install_bundle(discovery_configured)
+    install_celix_bundle(discovery_configured)
 
     target_link_libraries(discovery_configured celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/discovery_etcd/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_etcd/CMakeLists.txt b/remote_services/discovery_etcd/CMakeLists.txt
index 442d486..ce25d22 100644
--- a/remote_services/discovery_etcd/CMakeLists.txt
+++ b/remote_services/discovery_etcd/CMakeLists.txt
@@ -35,7 +35,7 @@ if (RSA_DISCOVERY_ETCD)
 	include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 	include_directories("private/include")
     
-	add_bundle(discovery_etcd 
+	add_celix_bundle(discovery_etcd
         VERSION 0.9.0
         SYMBOLIC_NAME "apache_celix_rsa_discovery_etcd"
         NAME "Apache Celix RSA Discovery ETCD"
@@ -54,7 +54,7 @@ if (RSA_DISCOVERY_ETCD)
 	    ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
 	)
 
-	install_bundle(discovery_etcd)
+	install_celix_bundle(discovery_etcd)
 		
 	target_link_libraries(discovery_etcd celix_framework etcdlib ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES})
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/discovery_shm/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_shm/CMakeLists.txt b/remote_services/discovery_shm/CMakeLists.txt
index 862096c..3eec195 100644
--- a/remote_services/discovery_shm/CMakeLists.txt
+++ b/remote_services/discovery_shm/CMakeLists.txt
@@ -32,7 +32,7 @@ find_package(CURL REQUIRED)
 	include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 	include_directories("private/include")
 
-	add_bundle(discovery_shm 
+	add_celix_bundle(discovery_shm
         VERSION 0.0.1
         SYMBOLIC_NAME "apache_celix_rsa_discovery_shm"
         NAME "Apache Celix RSA Discovery SHM"
@@ -51,7 +51,7 @@ find_package(CURL REQUIRED)
 	    ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
 	)
 
-	install_bundle(discovery_shm)
+	install_celix_bundle(discovery_shm)
 		
 	target_link_libraries(discovery_shm celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
 

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/examples/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/CMakeLists.txt b/remote_services/examples/CMakeLists.txt
index 44b7733..b919760 100644
--- a/remote_services/examples/CMakeLists.txt
+++ b/remote_services/examples/CMakeLists.txt
@@ -28,7 +28,7 @@ if (RSA_EXAMPLES)
     add_subdirectory(calculator_shell)
 
     if(BUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP AND BUILD_RSA_DISCOVERY_CONFIGURED)
-        add_deploy(remote-services-cfg-server 
+        add_celix_container(remote-services-cfg-server
             NAME "server"
             GROUP "remote-services/remote-services-cfg"
             BUNDLES discovery_configured topology_manager remote_service_admin_http calculator shell shell_tui log_service log_writer
@@ -42,7 +42,7 @@ if (RSA_EXAMPLES)
             org.apache.celix.calc.api.Calculator2_endpoint
         )
 
-        add_deploy(remote-services-cfg-client
+        add_celix_container(remote-services-cfg-client
             NAME "client"
             GROUP "remote-services/remote-services-cfg"
             BUNDLES topology_manager remote_service_admin_http shell shell_tui log_service log_writer calculator_shell discovery_configured
@@ -57,7 +57,7 @@ if (RSA_EXAMPLES)
     endif()
 
     if (BUILD_RSA_REMOTE_SERVICE_ADMIN_SHM AND BUILD_RSA_DISCOVERY_SHM)
-        add_deploy(remote-services-shm 
+        add_celix_container(remote-services-shm
             NAME "server"
             GROUP "remote-services/remote-services-shm"
             BUNDLES discovery_shm topology_manager remote_service_admin_shm calculator shell shell_tui log_service log_writer
@@ -66,7 +66,7 @@ if (RSA_EXAMPLES)
             BUNDLES org.apache.celix.calc.api.Calculator_endpoint
         )
 
-        add_deploy(remote-services-shm-client 
+        add_celix_container(remote-services-shm-client
             NAME "client"
             GROUP "remote-services/remote-services-shm"
             BUNDLES topology_manager remote_service_admin_shm shell shell_tui log_service log_writer calculator_shell discovery_shm
@@ -77,7 +77,7 @@ if (RSA_EXAMPLES)
     endif ()
 
     if (BUILD_RSA_DISCOVERY_ETCD AND BUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP)
-        add_deploy(remote-services-etcd 
+        add_celix_container(remote-services-etcd
             NAME "server"
             GROUP "remote-services/remote-services-etcd"
             BUNDLES discovery_etcd topology_manager remote_service_admin_http calculator shell shell_tui log_service log_writer
@@ -88,7 +88,7 @@ if (RSA_EXAMPLES)
             	org.apache.celix.calc.api.Calculator2_endpoint
         )
 
-        add_deploy("remote-services-etcd-client" 
+        add_celix_container("remote-services-etcd-client"
             NAME "client"
             GROUP "remote-services/remote-services-etcd"
             BUNDLES topology_manager remote_service_admin_http shell shell_tui log_service log_writer calculator_shell discovery_etcd
@@ -99,13 +99,13 @@ if (RSA_EXAMPLES)
     endif ()
 
     if (BUILD_RSA_DISCOVERY_ETCD AND BUILD_RSA_REMOTE_SERVICE_ADMIN_DFI)
-        add_deploy(remote-services-dfi 
+        add_celix_container(remote-services-dfi
             NAME "server"
             GROUP "remote-services/remote-services-dfi"
             BUNDLES discovery_etcd topology_manager remote_service_admin_dfi calculator shell shell_tui log_service log_writer
         )
 
-        add_deploy("remote-services-dfi-client" 
+        add_celix_container("remote-services-dfi-client"
             NAME "client"
             GROUP "remote-services/remote-services-dfi"
             BUNDLES topology_manager remote_service_admin_dfi shell shell_tui log_service log_writer calculator_shell discovery_etcd

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/examples/calculator_endpoint/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/calculator_endpoint/CMakeLists.txt b/remote_services/examples/calculator_endpoint/CMakeLists.txt
index 6e9c928..beb4ddb 100644
--- a/remote_services/examples/calculator_endpoint/CMakeLists.txt
+++ b/remote_services/examples/calculator_endpoint/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories("../../remote_service_admin/public/include")
 include_directories("../calculator_service/public/include")
 include_directories("private/include")
 
-add_bundle(org.apache.celix.calc.api.Calculator_endpoint SOURCES
+add_celix_bundle(org.apache.celix.calc.api.Calculator_endpoint SOURCES
 	private/src/calculator_endpoint_activator
 	private/src/calculator_endpoint_impl.c
     

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/examples/calculator_endpoint2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/calculator_endpoint2/CMakeLists.txt b/remote_services/examples/calculator_endpoint2/CMakeLists.txt
index b75e6df..2bd829f 100644
--- a/remote_services/examples/calculator_endpoint2/CMakeLists.txt
+++ b/remote_services/examples/calculator_endpoint2/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories("../../remote_service_admin/public/include")
 include_directories("../calculator_service/public/include")
 include_directories("private/include")
 
-add_bundle(org.apache.celix.calc.api.Calculator2_endpoint SOURCES
+add_celix_bundle(org.apache.celix.calc.api.Calculator2_endpoint SOURCES
 	private/src/calculator_endpoint_activator
 	private/src/calculator_endpoint_impl.c
     

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/examples/calculator_proxy/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/calculator_proxy/CMakeLists.txt b/remote_services/examples/calculator_proxy/CMakeLists.txt
index 9bbf089..3696347 100644
--- a/remote_services/examples/calculator_proxy/CMakeLists.txt
+++ b/remote_services/examples/calculator_proxy/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories("private/include")
 include_directories("../calculator_service/public/include")
 include_directories("../../endpoint_listener/public/include")
 
-add_bundle(org.apache.celix.calc.api.Calculator_proxy SOURCES
+add_celix_bundle(org.apache.celix.calc.api.Calculator_proxy SOURCES
 	private/src/calculator_proxy_activator
 	private/src/calculator_proxy_impl.c
     ../../remote_service_admin/private/src/remote_proxy_factory_impl.c

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/examples/calculator_proxy2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/calculator_proxy2/CMakeLists.txt b/remote_services/examples/calculator_proxy2/CMakeLists.txt
index 01556e3..73ec103 100644
--- a/remote_services/examples/calculator_proxy2/CMakeLists.txt
+++ b/remote_services/examples/calculator_proxy2/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories("private/include")
 include_directories("../calculator_service/public/include")
 include_directories("../../endpoint_listener/public/include")
 
-add_bundle(org.apache.celix.calc.api.Calculator2_proxy SOURCES
+add_celix_bundle(org.apache.celix.calc.api.Calculator2_proxy SOURCES
 	private/src/calculator_proxy_activator
 	private/src/calculator_proxy_impl.c
     ../../remote_service_admin/private/src/remote_proxy_factory_impl.c

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/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 a18f22b..d1cf31d 100644
--- a/remote_services/examples/calculator_service/CMakeLists.txt
+++ b/remote_services/examples/calculator_service/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("../../remote_service_admin/public/include")
 include_directories("private/include")
 include_directories("public/include")
 
-add_bundle(calculator SOURCES
+add_celix_bundle(calculator SOURCES
 	private/src/calculator_impl
 	private/src/calculator_activator
     

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/examples/calculator_shell/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/examples/calculator_shell/CMakeLists.txt b/remote_services/examples/calculator_shell/CMakeLists.txt
index 361b688..f6948a0 100644
--- a/remote_services/examples/calculator_shell/CMakeLists.txt
+++ b/remote_services/examples/calculator_shell/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories("../../../utils/public/include")
 include_directories("../calculator_service/public/include")
 include_directories("../../../shell/public/include")
 
-add_bundle(calculator_shell SOURCES
+add_celix_bundle(calculator_shell SOURCES
     private/src/add_command 
     private/src/sub_command
     private/src/sqrt_command

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt
index 7e2675c..b0fb0aa 100644
--- a/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
     ${PROJECT_SOURCE_DIR}/remote_services/examples/calculator_service/public/include
 )
 
-add_bundle(remote_service_admin_dfi 
+add_celix_bundle(remote_service_admin_dfi
     VERSION 0.9.0
     SYMBOLIC_NAME "apache_celix_remote_service_admin_dfi"
     NAME "Apache Celix Remote Service Admin Dynamic Function Interface (DFI)"
@@ -45,4 +45,4 @@ add_bundle(remote_service_admin_dfi
 )
 target_link_libraries(remote_service_admin_dfi celix_framework celix_utils celix_dfi ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
 
-install_bundle(remote_service_admin_dfi)
+install_celix_bundle(remote_service_admin_dfi)

http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt
index d172087..d25517e 100644
--- a/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(
 )
 
 
-add_bundle(rsa_dfi_tst_bundle
+add_celix_bundle(rsa_dfi_tst_bundle
     VERSION 0.0.1
     SOURCES
         tst_activator.c


Mime
View raw message