incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1203172 - in /incubator/celix/trunk: ./ cmake/ deployment_admin/ examples/ examples/echo_service/client/ examples/echo_service/server/ examples/hello_world/ examples/mongoose/ examples/osgi-in-action/chapter01-greeting-example/client/ exam...
Date Thu, 17 Nov 2011 12:47:43 GMT
Author: abroekhuis
Date: Thu Nov 17 12:47:42 2011
New Revision: 1203172

URL: http://svn.apache.org/viewvc?rev=1203172&view=rev
Log:
Build environment update

Updated the build environment to better support dependencies and up-to-date builds.

Modified:
    incubator/celix/trunk/cmake/CPackConfig.in
    incubator/celix/trunk/cmake/CPackConfigDeploy.in
    incubator/celix/trunk/cmake/CPackConfigPKG.in
    incubator/celix/trunk/cmake/Packaging.cmake
    incubator/celix/trunk/deployment_admin/CMakeLists.txt
    incubator/celix/trunk/examples/CMakeLists.txt
    incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
    incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
    incubator/celix/trunk/examples/hello_world/CMakeLists.txt
    incubator/celix/trunk/examples/mongoose/CMakeLists.txt
    incubator/celix/trunk/examples/mongoose/activator.c
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
    incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt
    incubator/celix/trunk/examples/receiver/CMakeLists.txt
    incubator/celix/trunk/examples/sender/CMakeLists.txt
    incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt
    incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt
    incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt
    incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
    incubator/celix/trunk/framework/CMakeLists.txt
    incubator/celix/trunk/framework/private/include/utils.h
    incubator/celix/trunk/framework/private/src/utils.c
    incubator/celix/trunk/log_service/CMakeLists.txt
    incubator/celix/trunk/log_writer/CMakeLists.txt
    incubator/celix/trunk/remote_services/CMakeLists.txt
    incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
    incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
    incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
    incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
    incubator/celix/trunk/remote_services/example_service/CMakeLists.txt
    incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
    incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
    incubator/celix/trunk/shell/CMakeLists.txt
    incubator/celix/trunk/shell/stop_command.c
    incubator/celix/trunk/shell_tui/CMakeLists.txt
    incubator/celix/trunk/target.cmake

Modified: incubator/celix/trunk/cmake/CPackConfig.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfig.in?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfig.in (original)
+++ incubator/celix/trunk/cmake/CPackConfig.in Thu Nov 17 12:47:42 2011
@@ -17,23 +17,13 @@
 
 SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CPACK_GENERATOR "@CPACK_GENERATOR@")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "@PROJECT_BINARY_DIR@;@PROJECT_NAME@;@BUNDLE_NAME@;/")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "@BUNDLE_BIN_DIR@;@BUNDLE_NAME@;@BUNDLE_NAME@;/")
 SET(CPACK_MODULE_PATH "")
 SET(CPACK_PACKAGE_DESCRIPTION "Package description")
-#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IBS @BUNDLE_NAME@ Package")
-#SET(CPACK_PACKAGE_FILE_NAME "@BUNDLE_NAME@-@IBS_VERSION@")
 SET(CPACK_PACKAGE_FILE_NAME "@BUNDLE_NAME@")
-#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "IBS")
 SET(CPACK_PACKAGE_NAME "@CPACK_PACKAGE_NAME@")
-#SET(CPACK_PACKAGE_VENDOR "HPA")
 SET(CPACK_PACKAGE_VERSION "@IBS_VERSION@")
-#SET(CPACK_PACKAGE_VERSION_MAJOR "@IBS_MAJOR@")
-#SET(CPACK_PACKAGE_VERSION_MINOR "@IBS_MINOR@")
-#SET(CPACK_PACKAGE_VERSION_PATCH "@IBS_PATCH@")
-#SET(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/cpack/License.txt")
-#SET(CPACK_RESOURCE_FILE_README "@PROJECT_SOURCE_DIR@/cpack/Readme.txt")
-#SET(CPACK_RESOURCE_FILE_WELCOME "@PROJECT_SOURCE_DIR@/cpack/Welcome.txt")
 SET(CPACK_SYSTEM_NAME "@CPACK_SYSTEM_NAME@")
 SET(CPACK_TOPLEVEL_TAG "@CPACK_TOPLEVEL_TAG@")
 SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "0")
-set(CPACK_INSTALLED_DIRECTORIES "@BUNDLE_SOURCE_DIR@/META-INF;/META-INF")
+#set(CPACK_INSTALLED_DIRECTORIES "@BUNDLE_SOURCE_DIR@/META-INF;/META-INF")

Modified: incubator/celix/trunk/cmake/CPackConfigDeploy.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfigDeploy.in?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfigDeploy.in (original)
+++ incubator/celix/trunk/cmake/CPackConfigDeploy.in Thu Nov 17 12:47:42 2011
@@ -17,7 +17,8 @@
 
 SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CPACK_GENERATOR "@CPACK_GENERATOR@")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "@PROJECT_BINARY_DIR@;@PROJECT_NAME@;@DEPLOY_COMPONENT@;/") 
+#SET(CPACK_INSTALL_CMAKE_PROJECTS "@PROJECT_BINARY_DIR@;@PROJECT_NAME@;@DEPLOY_COMPONENT@;/")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "@DEPLOY_BIN_DIR@;@DEPLOY_NAME@;@DEPLOY_COMPONENT@;/") 
 SET(CPACK_MODULE_PATH "")
 SET(CPACK_PACKAGE_DESCRIPTION "Package description")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IBS @DEPLOY_NAME@ Package")

Modified: incubator/celix/trunk/cmake/CPackConfigPKG.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfigPKG.in?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfigPKG.in (original)
+++ incubator/celix/trunk/cmake/CPackConfigPKG.in Thu Nov 17 12:47:42 2011
@@ -17,7 +17,7 @@
 
 SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CPACK_GENERATOR "@CPACK_GENERATOR@")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "@PROJECT_BINARY_DIR@;@PROJECT_NAME@;@PACKAGE_COMPONENT@;/")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "@BUNDLE_BIN_DIR@;@BUNDLE_NAME@;@PACKAGE_COMPONENT@;/")
 SET(CPACK_MODULE_PATH "")
 SET(CPACK_PACKAGE_DESCRIPTION "Package description")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PACKAGE_NAME@_pkg")

Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Thu Nov 17 12:47:42 2011
@@ -22,49 +22,39 @@ IF(NOT CPACK_COMMAND)
 	MESSAGE(FATAL_ERROR "Need CPack!")
 ENDIF(NOT CPACK_COMMAND)
 
-#IF(UNIX)
-#	SET(CPACK_GENERATOR "TGZ;STGZ")
-#ENDIF(UNIX)
-#IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-#	SET(CPACK_GENERATOR "TBZ2;STGZ")
-#ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-#IF(WIN32)
-#	SET(CPACK_GENERATOR "NSIS;ZIP")
-#ENDIF(WIN32)
-
 SET(CPACK_GENERATOR "ZIP")
 
-ADD_CUSTOM_TARGET(bundles)
-ADD_CUSTOM_TARGET(packages)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/bundles ${PROJECT_BINARY_DIR}/packages)
 
 MACRO(bundle)
-    PARSE_ARGUMENTS(BUNDLE "FILES;DIRECTORIES" "" ${ARGN})
+    PARSE_ARGUMENTS(BUNDLE "SOURCES;FILES;DIRECTORIES" "" ${ARGN})
     LIST(GET BUNDLE_DEFAULT_ARGS 0 BUNDLE_NAME)
     
-    #install (DIRECTORY META-INF DESTINATION . COMPONENT ${BUNDLE_NAME} FILES_MATCHING PATTERN "*" PATTERN ".svn" EXCLUDE)
-	
-	install (TARGETS ${BUNDLE_NAME} DESTINATION . COMPONENT ${BUNDLE_NAME})
+	add_library(${BUNDLE_NAME} SHARED ${BUNDLE_SOURCES})
     
+    install (DIRECTORY META-INF DESTINATION . COMPONENT ${BUNDLE_NAME} FILES_MATCHING PATTERN "*" PATTERN ".svn" EXCLUDE)
+	install (TARGETS ${BUNDLE_NAME} DESTINATION . COMPONENT ${BUNDLE_NAME})
     if (BUNDLE_FILES)
 	    install (FILES ${BUNDLE_FILES} DESTINATION . COMPONENT ${BUNDLE_NAME})
     endif(BUNDLE_FILES)
     if (BUNDLE_DIRECTORIES)
 	    install (DIRECTORY ${BUNDLE_DIRECTORIES} DESTINATION . COMPONENT ${BUNDLE_NAME})
     endif(BUNDLE_DIRECTORIES)
-    
 
-	SET(__bundleTarget bundle_${BUNDLE_NAME})
 	SET(__bundleConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${BUNDLE_NAME}-bundle.cmake)
-	SET(BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
+	SET(BUNDLE_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
 	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfig.in ${__bundleConfig} @ONLY)
-	ADD_CUSTOM_TARGET(${__bundleTarget}
-		mkdir -p ${PROJECT_BINARY_DIR}/bundles \;
-		cd ${PROJECT_BINARY_DIR}/bundles \; 
-		${CPACK_COMMAND} --config "${__bundleConfig}"
+	ADD_CUSTOM_COMMAND(TARGET ${BUNDLE_NAME}
+		POST_BUILD
+		COMMAND ${CPACK_COMMAND} ARGS --config ${__bundleConfig}
+		COMMAND mkdir -p ${PROJECT_BINARY_DIR}/ziptojar \;
+			cd ${PROJECT_BINARY_DIR}/ziptojar \;
+			jar -xf ${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip \;
+			jar -cfm ${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip META-INF/MANIFEST.MF . \;
+			rm -rf ${PROJECT_BINARY_DIR}/ziptojar/*
+		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bundles
 	)
-	ADD_DEPENDENCIES(bundles ${__bundleTarget})
-	ADD_DEPENDENCIES(${__bundleTarget} ${BUNDLE_NAME})
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip)
 ENDMACRO(bundle)
 	
 MACRO(package)
@@ -72,9 +62,6 @@ MACRO(package)
     LIST(GET PACKAGE_DEFAULT_ARGS 0 PACKAGE_NAME)
 	
 	SET(PACKAGE_COMPONENT package_${PACKAGE_NAME})
-	SET(__packageTarget package_${PACKAGE_NAME})
-	SET(__bundleTarget bundle_${PACKAGE_NAME})
-	SET(__packageConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${PACKAGE_NAME}-pkg.cmake)
 	
 	install (FILES ${PROJECT_BINARY_DIR}/bundles/${PACKAGE_NAME}.zip DESTINATION . COMPONENT ${PACKAGE_COMPONENT})
 	
@@ -85,17 +72,18 @@ MACRO(package)
 	    install (DIRECTORY ${PACKAGE_DIRECTORIES} DESTINATION . COMPONENT ${PACKAGE_COMPONENT})
     endif(PACKAGE_DIRECTORIES)
 
+	SET(__packageConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${PACKAGE_NAME}-pkg.cmake)
 	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigPKG.in ${__packageConfig} @ONLY)
-	ADD_CUSTOM_TARGET(${__packageTarget}
-		mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/packages \;
-		cd ${CMAKE_CURRENT_BINARY_DIR}/packages \; 
-		${CPACK_COMMAND} --config "${__packageConfig}"
+	ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_NAME}
+		POST_BUILD
+		COMMAND mkdir -p ${PROJECT_BINARY_DIR}/packages \;
+			cd ${PROJECT_BINARY_DIR}/packages \; 
+			${CPACK_COMMAND} --config "${__packageConfig}"
+		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/packages
 	)
-	ADD_DEPENDENCIES(${__packageTarget} ${__bundleTarget})
-	ADD_DEPENDENCIES(packages ${__packageTarget})
-	ADD_CUSTOM_TARGET(clean_${__packageTarget}
-	    rm ${PROJECT_BINARY_DIR}/packages/IBS-${PACKAGE_NAME}
-    )
+	
+	GET_DIRECTORY_PROPERTY(PROPS ADDITIONAL_MAKE_CLEAN_FILES)
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROPS};${PROJECT_BINARY_DIR}/packages/${PACKAGE_NAME}_pkg.zip")
 ENDMACRO(package)
 
 
@@ -106,25 +94,32 @@ MACRO(deploy)
 	
 	SET(DEPLOY_COMPONENT deploy_${DEPLOY_NAME})
 	SET(__deployTarget deploy_${DEPLOY_NAME})
-	SET(__deployConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${DEPLOY_NAME}-deploy.cmake)
+	#SET(__deployConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${DEPLOY_NAME}-deploy.cmake)
 		
-	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigDeploy.in ${__deployConfig} @ONLY)
-	ADD_CUSTOM_TARGET(${__deployTarget}
-		mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/deploy \;
-		cd ${CMAKE_CURRENT_BINARY_DIR}/deploy \; 
-		${CPACK_COMMAND} --config "${__deployConfig}"
-	)
+	#SET(DEPLOY_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME})
+	#CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigDeploy.in ${__deployConfig} @ONLY)
 	#install(FILES ${EXT_DIR}/celix/* DESTINATION . COMPONENT ${DEPLOY_COMPONENT})
 	
 	SET(BUNDLES "")
-	foreach(BUNDLE ${DEPLOY_BUNDLES})
-		add_custom_command(TARGET ${__deployTarget}
+	SET(DEPS)
+	FOREACH(BUNDLE ${DEPLOY_BUNDLES})
+		SET(DEP_NAME ${DEPLOY_NAME}_${BUNDLE}) 
+		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip
       		COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/bundles/${BUNDLE}.zip 
       			${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip
+  			DEPENDS ${BUNDLE}
+  			COMMENT "Deploying ${BUNDLE} to ${DEPLOY_NAME}"
       	)
 	    SET(BUNDLES "${BUNDLES} bundles/${BUNDLE}.zip")
-	    ADD_DEPENDENCIES(${__deployTarget} bundle_${BUNDLE})
-	endforeach(BUNDLE)
+	    SET(DEPS ${DEPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip)
+	ENDFOREACH(BUNDLE)
+    ADD_CUSTOM_TARGET(${__deployTarget} 
+    	#mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/deploy \;
+		#	cd ${CMAKE_CURRENT_BINARY_DIR}/deploy \; 
+		#	${CPACK_COMMAND} --config "${__deployConfig}"
+    	DEPENDS ${DEPS} 
+    	COMMENT "Deploy target ${DEPLOY_NAME}")
+    ADD_DEPENDENCIES(deploy ${__deployTarget})
 	
 	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/config.properties.in ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/config.properties @ONLY)
 	
@@ -142,8 +137,10 @@ MACRO(deploy)
 	
 	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/run.sh.in ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/run.sh @ONLY)
 	
-	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME} DESTINATION . COMPONENT ${DEPLOY_COMPONENT})
-	ADD_DEPENDENCIES(deploy ${__deployTarget})
+	GET_DIRECTORY_PROPERTY(PROPS ADDITIONAL_MAKE_CLEAN_FILES)
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}")
+	
+	#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME} DESTINATION . COMPONENT ${DEPLOY_COMPONENT})
 	#ADD_CUSTOM_TARGET(clean_${__packageTarget}
 	#    rm ${PROJECT_BINARY_DIR}/packages/IBS-${PACKAGE_NAME}
     #)

Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -22,7 +22,7 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/private/include")
 
 link_directories("/opt/local/lib")
-add_library(deployment_admin SHARED
+bundle(deployment_admin SOURCES
 	private/src/deployment_package 
 	private/src/deployment_admin
 	private/src/deployment_admin_activator
@@ -32,6 +32,4 @@ add_library(deployment_admin SHARED
 )
 target_link_libraries(deployment_admin framework curl)
 
-bundle(deployment_admin)
-
 deploy("deployment-admin" BUNDLES deployment_admin shell shell_tui log_service log_writer)

Modified: incubator/celix/trunk/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -32,6 +32,6 @@ add_subdirectory(osgi-in-action/chapter0
 add_subdirectory(osgi-in-action/chapter01-greeting-example)
 add_subdirectory(osgi-in-action/chapter04-paint-example)
 
-deploy(chapter01-greeting-example BUNDLES shell shell_tui log_service chapter01-greeting-example-client chapter01-greeting-example)
 deploy(chapter04-correct-listener BUNDLES shell shell_tui log_service chapter04-correct-listener)
+deploy(chapter01-greeting-example BUNDLES shell shell_tui log_service chapter01-greeting-example-client chapter01-greeting-example)
 deploy("chapter04-paint-example" BUNDLES chapter04-paint-example circle square triangle shell shell_tui log_service log_writer)

Modified: incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -1,7 +1,5 @@
-add_library(echo_client SHARED echo_client_activator echo_client)
+bundle(echo_client SOURCES echo_client_activator echo_client)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("../server")
 target_link_libraries(echo_client framework)
-
-bundle(echo_client)

Modified: incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -1,6 +1,4 @@
-add_library(echo_server SHARED echo_server_activator echo_server)
+bundle(echo_server SOURCES echo_server_activator echo_server)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(echo_server framework)
-
-bundle(echo_server)

Modified: incubator/celix/trunk/examples/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/hello_world/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(hello_world SHARED activator)
+bundle(hello_world SOURCES activator)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(hello_world framework)
-
-bundle(hello_world)

Modified: incubator/celix/trunk/examples/mongoose/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/mongoose/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -18,8 +18,8 @@
 add_library(mongoose STATIC mongoose.c)
 SET_TARGET_PROPERTIES(mongoose PROPERTIES COMPILE_FLAGS -fPIC)
 
-add_library(celix.mongoose SHARED activator)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+bundle(celix.mongoose SOURCES activator DIRECTORIES root)
 target_link_libraries(celix.mongoose framework mongoose)
 
-bundle(celix.mongoose DIRECTORIES root)
+

Modified: incubator/celix/trunk/examples/mongoose/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/activator.c?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/activator.c (original)
+++ incubator/celix/trunk/examples/mongoose/activator.c Thu Nov 17 12:47:42 2011
@@ -56,6 +56,7 @@ celix_status_t bundleActivator_start(voi
 
             const char *options[] = {
                 "document_root", entry,
+                "listening_ports", "8081",
                 NULL
             };
             data->ctx = mg_start(NULL, options);

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,9 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(chapter01-greeting-example-client SHARED private/src/client)
+bundle(chapter01-greeting-example-client SOURCES private/src/client)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("../greeting/public/include")
 target_link_libraries(chapter01-greeting-example-client framework)
-
-bundle(chapter01-greeting-example-client)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,10 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(chapter01-greeting-example SHARED private/src/activator private/src/greeting_impl)
+bundle(chapter01-greeting-example SOURCES private/src/activator private/src/greeting_impl)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("public/include")
 include_directories("private/include")
 target_link_libraries(chapter01-greeting-example framework)
-
-bundle(chapter01-greeting-example)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,9 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(chapter04-correct-listener SHARED private/src/listener_example)
+bundle(chapter04-correct-listener SOURCES private/src/listener_example)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(chapter04-correct-listener framework)
-
-bundle(chapter04-correct-listener)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,9 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(chapter04-correct-lookup SHARED private/src/activator)
+bundle(chapter04-correct-lookup SOURCES private/src/activator)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(chapter04-correct-lookup framework pthread)
-
-bundle(chapter04-correct-lookup)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -33,12 +33,13 @@ link_directories(${GTK_LIBRARY_DIRS})
 link_directories(${GLIB_LIBRARY_DIRS})
 link_directories(${GTHR_LIBRARY_DIRS})
 
-add_library(circle SHARED 
- private/src/activator
- private/src/circle_shape
+bundle(circle SOURCES 
+ 	private/src/activator
+ 	private/src/circle_shape
+ FILES
+ 	private/src/circle.png
  )
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(circle framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
 
-bundle(circle FILES private/src/circle.png)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -40,14 +40,14 @@ link_directories(${GLIB_LIBRARY_DIRS})
 link_directories(${GTHR_LIBRARY_DIRS})
 link_directories(${GMODULE_LIBRARY_DIRS})
 
-add_library(chapter04-paint-example SHARED 
+bundle(chapter04-paint-example SOURCES 
 	private/src/activator
 	private/src/default_shape
 	private/src/shape_component
 	private/src/paint_frame
+  FILES
+  	private/src/underc.png gtktest.glade
  )
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(chapter04-paint-example framework ${MODULE_LIBRARIES} ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
-
-bundle(chapter04-paint-example FILES private/src/underc.png gtktest.glade)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -33,12 +33,12 @@ link_directories(${GTK_LIBRARY_DIRS})
 link_directories(${GLIB_LIBRARY_DIRS})
 link_directories(${GTHR_LIBRARY_DIRS})
 
-add_library(square SHARED 
- private/src/activator
- private/src/square_shape
+bundle(square SOURCES 
+ 	private/src/activator
+ 	private/src/square_shape
+ FILES 
+ 	private/src/square.png
 )
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(square framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
-
-bundle(square FILES private/src/square.png)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -33,12 +33,12 @@ link_directories(${GTK_LIBRARY_DIRS})
 link_directories(${GLIB_LIBRARY_DIRS})
 link_directories(${GTHR_LIBRARY_DIRS})
 
-add_library(triangle SHARED 
- private/src/activator
- private/src/triangle_shape
+bundle(triangle SOURCES 
+ 	private/src/activator
+ 	private/src/triangle_shape
+ FILES 
+ 	private/src/triangle.png
  )
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(triangle framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
-
-bundle(triangle FILES private/src/triangle.png)

Modified: incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,10 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(receiver-2.0 SHARED activator serviceTest)
+bundle(receiver-2.0 SOURCES activator serviceTest)
 include_directories("${PROJECT_SOURCE_DIR}/celix" "${PROJECT_SOURCE_DIR}/dependency_manager")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") 
 target_link_libraries(receiver-2.0 dependency_manager framework)
 
-bundle(receiver-2.0)
 package(receiver-2.0 FILES serviceTest.h)
\ No newline at end of file

Modified: incubator/celix/trunk/examples/receiver/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/receiver/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/receiver/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/receiver/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,10 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(receiver SHARED activator serviceTest)
+bundle(receiver SOURCES activator serviceTest)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(receiver framework)
 
-bundle(receiver)
 package(receiver FILES serviceTest.h)
\ No newline at end of file

Modified: incubator/celix/trunk/examples/sender/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/sender/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/sender/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/sender/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(sender SHARED test_activator listenerTest)
+bundle(sender SOURCES test_activator listenerTest)
 include_directories("${PROJECT_SOURCE_DIR}/celix" "${PROJECT_SOURCE_DIR}/dependency_manager")
 include_directories("${PROJECT_SOURCE_DIR}/receiver")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(sender framework dependency_manager)
 
-bundle(sender)
 package(sender)

Modified: incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(publisherA SHARED activator publisher)
+bundle(publisherA SOURCES activator publisher)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("../publisherService")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(publisherA framework)
 
-bundle(publisherA)
 package(publisherA FILES ../publisherService/publisher.h)
\ No newline at end of file

Modified: incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(publisherB SHARED activator publisher)
+bundle(publisherB SOURCES activator publisher)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("../publisherService")
 target_link_libraries(publisherB framework)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 
-bundle(publisherB)
 package(publisherB FILES ../publisherService/publisher.h)
\ No newline at end of file

Modified: incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,10 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(tracker SHARED activator)
+bundle(tracker SOURCES activator)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("../publisherService")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(tracker framework)
-
-bundle(tracker)

Modified: incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,12 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(tracker_depman SHARED dependency_activator tracker)
+bundle(tracker_depman SOURCES dependency_activator tracker)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("${PROJECT_SOURCE_DIR}/dependency_manager")
 include_directories("../publisherService")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(tracker_depman framework dependency_manager)
-
-bundle(tracker_depman)

Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -34,13 +34,13 @@ include(UseDoxygen)
 
 add_definitions(-DUSE_FILE32API)
 aux_source_directory("private/src" SRC)
-include_directories(${CURL_INCLUDE_DIR})
+#include_directories(${CURL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIR})
 include_directories("private/include")
 include_directories("public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 add_library(framework SHARED ${SRC})
-target_link_libraries(framework utils ${ZLIB_LIBRARY} ${APR_LIBRARY} ${APRUTIL_LIBRARY} ${CURL_LIBRARY})
+target_link_libraries(framework utils ${ZLIB_LIBRARY} ${APR_LIBRARY})
 
 install(TARGETS framework DESTINATION lib COMPONENT framework)
 FILE(GLOB files "private/include/*.h")

Modified: incubator/celix/trunk/framework/private/include/utils.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/utils.h?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/utils.h (original)
+++ incubator/celix/trunk/framework/private/include/utils.h Thu Nov 17 12:47:42 2011
@@ -39,4 +39,6 @@ char * string_trim(char * string);
 
 celix_status_t thread_equalsSelf(apr_os_thread_t thread, bool *equals);
 
+celix_status_t utils_isNumeric(char *number, bool *ret);
+
 #endif /* UTILS_H_ */

Modified: incubator/celix/trunk/framework/private/src/utils.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/utils.c?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/utils.c (original)
+++ incubator/celix/trunk/framework/private/src/utils.c Thu Nov 17 12:47:42 2011
@@ -88,3 +88,16 @@ celix_status_t thread_equalsSelf(apr_os_
 
 	return status;
 }
+
+celix_status_t utils_isNumeric(char *number, bool *ret) {
+	celix_status_t status = CELIX_SUCCESS;
+	*ret = true;
+	while(*number) {
+		if(!isdigit(*number) && *number != '.') {
+			*ret = false;
+			break;
+		}
+		number++;
+	}
+	return status;
+}

Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(log_service SHARED
+bundle(log_service SOURCES
 	private/src/log
 	private/src/log_entry
 	private/src/log_factory  
@@ -28,7 +28,6 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/log_service/private/include")
 target_link_libraries(log_service framework)
 
-bundle(log_service)
 package(log_service FILES public/include/log_service.h)
 
 FILE(GLOB files public/include/log_service.h)

Modified: incubator/celix/trunk/log_writer/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,13 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(log_writer SHARED dependency_activator log_writer)
+bundle(log_writer SOURCES dependency_activator log_writer)
 include_directories("${PROJECT_SOURCE_DIR}/celix")
 include_directories("${PROJECT_SOURCE_DIR}/dependency_manager")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(log_writer framework dependency_manager)
 
-bundle(log_writer)
-
 INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_writer.zip DESTINATION bundles COMPONENT framework)

Modified: incubator/celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -25,5 +25,5 @@ add_subdirectory(example_endpoint)
 add_subdirectory(example_proxy)
 add_subdirectory(calc_shell)
 
-deploy("remote-services" BUNDLES discovery topology_manager remote_service_admin example shell shell_tui log_service log_writer)
-deploy("remote-services-client" BUNDLES discovery topology_manager remote_service_admin shell shell_tui log_service log_writer calc_shell)
+#deploy("remote-services" BUNDLES discovery topology_manager remote_service_admin example shell shell_tui log_service log_writer)
+#deploy("remote-services-client" BUNDLES discovery topology_manager remote_service_admin shell shell_tui log_service log_writer calc_shell)

Modified: incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(calc_shell SHARED
+bundle(calc_shell SOURCES
 	private/src/add_command 
 	private/src/sub_command
 	private/src/sqrt_command
@@ -27,4 +27,3 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/shell")
 target_link_libraries(calc_shell framework)
 
-bundle(calc_shell)

Modified: incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -22,10 +22,9 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
 
 link_directories("/opt/local/lib")
-add_library(discovery SHARED 
+bundle(discovery SOURCES 
 	private/src/discovery 
 	private/src/discovery_activator
 )
-target_link_libraries(discovery framework slp.a)
+target_link_libraries(discovery framework ${APRUTIL_LIBRARY} slp.a)
 
-bundle(discovery)

Modified: incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -22,10 +22,8 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_endpoint/private/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_service/public/include")
 
-add_library(example_endpoint SHARED 
+bundle(example_endpoint SOURCES 
 	private/src/example_endpoint_activator
 	private/src/example_endpoint_impl.c
 )
 target_link_libraries(example_endpoint framework jansson.a)
-
-bundle(example_endpoint)

Modified: incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -24,10 +24,8 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_service/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
 
-add_library(example_proxy SHARED 
+bundle(example_proxy SOURCES 
 	private/src/example_proxy_activator
 	private/src/example_proxy_impl.c
 )
 target_link_libraries(example_proxy framework jansson.a curl.a)
-
-bundle(example_proxy)

Modified: incubator/celix/trunk/remote_services/example_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_service/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -20,10 +20,8 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_service/private/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_service/public/include")
 
-add_library(example SHARED 
+bundle(example SOURCES 
 	private/src/example_impl
 	private/src/example_activator  
 )
 target_link_libraries(example framework)
-
-bundle(example)

Modified: incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -22,13 +22,11 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
 
-add_library(remote_service_admin SHARED 
+bundle(remote_service_admin SOURCES 
 	private/src/remote_service_admin_impl
 	private/src/export_registration_impl
 	private/src/import_registration_impl
 	private/src/remote_service_admin_activator
 	private/src/mongoose.c  
 )
-target_link_libraries(remote_service_admin framework jansson.a)
-
-bundle(remote_service_admin)
+target_link_libraries(remote_service_admin framework ${APRUTIL_LIBRARY} jansson.a)

Modified: incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -20,7 +20,5 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
 
-add_library(topology_manager SHARED private/src/topology_manager private/src/activator)
-target_link_libraries(topology_manager framework)
-
-bundle(topology_manager)
+bundle(topology_manager SOURCES private/src/topology_manager private/src/activator)
+target_link_libraries(topology_manager framework ${APRUTIL_LIBRARY})

Modified: incubator/celix/trunk/shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(shell SHARED shell command
+bundle(shell SOURCES shell command
 	ps_command start_command stop_command
 	install_command update_command
 	uninstall_command log_command
@@ -24,7 +24,6 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 target_link_libraries(shell framework curl)
 
-bundle(shell)
 package(shell FILES shell.h command.h)
 
 FILE(GLOB files shell.h command.h)

Modified: incubator/celix/trunk/shell/stop_command.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/stop_command.c?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/shell/stop_command.c (original)
+++ incubator/celix/trunk/shell/stop_command.c Thu Nov 17 12:47:42 2011
@@ -29,6 +29,7 @@
 #include "array_list.h"
 #include "bundle_context.h"
 #include "bundle.h"
+#include "utils.h"
 
 void stopCommand_execute(COMMAND command, char * line, void (*out)(char *), void (*err)(char *));
 
@@ -52,13 +53,19 @@ void stopCommand_execute(COMMAND command
 	sub = strtok(line, delims);
 	sub = strtok(NULL, delims);
 	while (sub != NULL) {
-		long id = atol(sub);
-		BUNDLE bundle = NULL;
-		bundleContext_getBundleById(command->bundleContext, id, &bundle);
-		if (bundle != NULL) {
-			bundle_stop(bundle, 0);
+		bool numeric;
+		utils_isNumeric(sub, &numeric);
+		if (numeric) {
+			long id = atol(sub);
+			BUNDLE bundle = NULL;
+			bundleContext_getBundleById(command->bundleContext, id, &bundle);
+			if (bundle != NULL) {
+				bundle_stop(bundle, 0);
+			} else {
+				err("Bundle id is invalid.");
+			}
 		} else {
-			err("Bundle id is invalid.");
+			err("Bundle id should be a number (bundle id).\n");
 		}
 		sub = strtok(NULL, delims);
 	}

Modified: incubator/celix/trunk/shell_tui/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/CMakeLists.txt?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell_tui/CMakeLists.txt Thu Nov 17 12:47:42 2011
@@ -15,12 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_library(shell_tui SHARED shell_tui)
+bundle(shell_tui SOURCES shell_tui)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/shell")
 target_link_libraries(shell_tui framework)
 
-bundle(shell_tui)
 package(shell_tui)
 
 INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell_tui.zip DESTINATION bundles COMPONENT framework)
\ No newline at end of file

Modified: incubator/celix/trunk/target.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/target.cmake?rev=1203172&r1=1203171&r2=1203172&view=diff
==============================================================================
--- incubator/celix/trunk/target.cmake (original)
+++ incubator/celix/trunk/target.cmake Thu Nov 17 12:47:42 2011
@@ -17,8 +17,8 @@
 
 #deploy("name" BUNDLES receiver receiver-2.0 sender shell shell_tui)
 #deploy("shell test" BUNDLES shell)
-deploy("hello_world" BUNDLES shell shell_tui hello_world celix.mongoose log_service log_writer)
+#deploy("hello_world" BUNDLES shell shell_tui hello_world celix.mongoose log_service log_writer)
 #deploy("deployer" BUNDLES shell shell_tui deployer)
-deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
-deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service log_writer)
-deploy("echo" BUNDLES echo_server echo_client shell shell_tui)
\ No newline at end of file
+#deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
+#deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service log_writer)
+#deploy("echo" BUNDLES echo_server echo_client shell shell_tui)
\ No newline at end of file



Mime
View raw message