celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1660592 - in /celix/trunk/remote_services: ./ discovery_bonjour/ discovery_bonjour/private/include/ discovery_bonjour/private/src/ discovery_slp/ discovery_slp/private/include/ discovery_slp/private/src/
Date Wed, 18 Feb 2015 11:07:01 GMT
Author: abroekhuis
Date: Wed Feb 18 11:07:00 2015
New Revision: 1660592

URL: http://svn.apache.org/r1660592
Log:
CELIX-212: Removed SLP and Bonjour discovery.

Removed:
    celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
    celix/trunk/remote_services/discovery_bonjour/private/include/discovery.h
    celix/trunk/remote_services/discovery_bonjour/private/src/discovery.c
    celix/trunk/remote_services/discovery_bonjour/private/src/discovery_activator.c
    celix/trunk/remote_services/discovery_slp/CMakeLists.txt
    celix/trunk/remote_services/discovery_slp/private/include/discovery.h
    celix/trunk/remote_services/discovery_slp/private/src/discovery.c
    celix/trunk/remote_services/discovery_slp/private/src/discovery_activator.c
Modified:
    celix/trunk/remote_services/CMakeLists.txt
    celix/trunk/remote_services/deploy.cmake

Modified: celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/CMakeLists.txt?rev=1660592&r1=1660591&r2=1660592&view=diff
==============================================================================
--- celix/trunk/remote_services/CMakeLists.txt (original)
+++ celix/trunk/remote_services/CMakeLists.txt Wed Feb 18 11:07:00 2015
@@ -33,8 +33,6 @@ if (REMOTE_SERVICE_ADMIN)
     add_subdirectory(remote_service_admin)
     add_subdirectory(remote_service_admin_http)
     add_subdirectory(remote_service_admin_shm)   
-    add_subdirectory(discovery_slp)
-    add_subdirectory(discovery_bonjour)
     add_subdirectory(discovery_configured)
     add_subdirectory(discovery_etcd)
     add_subdirectory(discovery_shm)

Modified: celix/trunk/remote_services/deploy.cmake
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/deploy.cmake?rev=1660592&r1=1660591&r2=1660592&view=diff
==============================================================================
--- celix/trunk/remote_services/deploy.cmake (original)
+++ celix/trunk/remote_services/deploy.cmake Wed Feb 18 11:07:00 2015
@@ -27,24 +27,6 @@ if (REMOTE_SERVICE_ADMIN)
 	#discovery will discover services before the topology manager is registered as 
 	#endpoint listener and services will be lost. This needs further study.
 
-    is_enabled(RSA_BUNDLES_DISCOVERY_BONJOUR)
-    if (RSA_BUNDLES_DISCOVERY_BONJOUR)
-        deploy("remote-services-bj" BUNDLES discovery_bonjour topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer 
-                                    ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
-        deploy("remote-services-bj-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_bonjour
-                                           ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
-    endif (RSA_BUNDLES_DISCOVERY_BONJOUR)
-
-
-    is_enabled(RSA_BUNDLES_DISCOVERY_SLP)
-    if (RSA_BUNDLES_DISCOVERY_SLP)
-        deploy("remote-services-slp" BUNDLES discovery_slp topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer
-                                     ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
-        deploy("remote-services-slp-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_slp
-                                            ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
-    endif (RSA_BUNDLES_DISCOVERY_SLP)
-
-
     is_enabled(RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
     if (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
         is_enabled(RSA_BUNDLES_DISCOVERY_SHM)



Mime
View raw message