You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2015/02/18 13:02:08 UTC
svn commit: r1660605 - in /celix/trunk/remote_services: ./ calc_shell/
calculator_endpoint/ calculator_endpoint2/ calculator_proxy/
calculator_proxy2/ calculator_service/ calculator_shell/
discovery_configured/ discovery_etcd/ discovery_shm/ example_en...
Author: abroekhuis
Date: Wed Feb 18 12:02:07 2015
New Revision: 1660605
URL: http://svn.apache.org/r1660605
Log:
CELIX-90: Updated the CMake build options for remote services.
- Moved examples to a dedicated sub-directory
- Added options for all parts (topo manager, http rsa etc)
- Renamed options to have shorter names
Added:
celix/trunk/remote_services/examples/
celix/trunk/remote_services/examples/CMakeLists.txt
- copied, changed from r1660583, celix/trunk/remote_services/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_endpoint/
- copied from r1660583, celix/trunk/remote_services/calculator_endpoint/
celix/trunk/remote_services/examples/calculator_endpoint2/
- copied from r1660583, celix/trunk/remote_services/calculator_endpoint2/
celix/trunk/remote_services/examples/calculator_proxy/
- copied from r1660583, celix/trunk/remote_services/calculator_proxy/
celix/trunk/remote_services/examples/calculator_proxy2/
- copied from r1660583, celix/trunk/remote_services/calculator_proxy2/
celix/trunk/remote_services/examples/calculator_service/
- copied from r1660583, celix/trunk/remote_services/calculator_service/
celix/trunk/remote_services/examples/calculator_shell/
- copied from r1660583, celix/trunk/remote_services/calculator_shell/
celix/trunk/remote_services/examples/deploy.cmake
- copied, changed from r1660583, celix/trunk/remote_services/deploy.cmake
Removed:
celix/trunk/remote_services/calc_shell/
celix/trunk/remote_services/calculator_endpoint/
celix/trunk/remote_services/calculator_endpoint2/
celix/trunk/remote_services/calculator_proxy/
celix/trunk/remote_services/calculator_proxy2/
celix/trunk/remote_services/calculator_service/
celix/trunk/remote_services/calculator_shell/
celix/trunk/remote_services/deploy.cmake
celix/trunk/remote_services/example_endpoint/
celix/trunk/remote_services/example_proxy/
celix/trunk/remote_services/example_service/
celix/trunk/remote_services/remote_service_admin/META-INF/
Modified:
celix/trunk/remote_services/CMakeLists.txt
celix/trunk/remote_services/discovery_configured/CMakeLists.txt
celix/trunk/remote_services/discovery_etcd/CMakeLists.txt
celix/trunk/remote_services/discovery_shm/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_endpoint/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_endpoint2/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_proxy/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_proxy2/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_service/CMakeLists.txt
celix/trunk/remote_services/examples/calculator_shell/CMakeLists.txt
celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt
celix/trunk/remote_services/topology_manager/CMakeLists.txt
Modified: celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/CMakeLists.txt (original)
+++ celix/trunk/remote_services/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(REMOTE_SERVICE_ADMIN "Option to enable building the Remote Service Admin Service bundles" OFF DEPS LAUNCHER shell_tui log_writer)
+celix_subproject(REMOTE_SERVICE_ADMIN "Option to enable building the Remote Service Admin Service bundles" OFF)
if (REMOTE_SERVICE_ADMIN)
# Add -fPIC for x86_64 Unix platforms; this lib will be linked to a shared lib
if(UNIX AND NOT WIN32)
@@ -29,20 +29,19 @@ if (REMOTE_SERVICE_ADMIN)
endif(CMAKE_UNAME)
endif(UNIX AND NOT WIN32)
+ add_subdirectory(examples)
+
add_subdirectory(topology_manager)
+
add_subdirectory(remote_service_admin)
add_subdirectory(remote_service_admin_http)
add_subdirectory(remote_service_admin_shm)
+
add_subdirectory(discovery_configured)
add_subdirectory(discovery_etcd)
add_subdirectory(discovery_shm)
- add_subdirectory(calculator_service)
- add_subdirectory(calculator_endpoint)
- add_subdirectory(calculator_endpoint2)
- add_subdirectory(calculator_proxy)
- add_subdirectory(calculator_proxy2)
- add_subdirectory(calculator_shell)
+
endif (REMOTE_SERVICE_ADMIN)
Modified: celix/trunk/remote_services/discovery_configured/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_configured/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_configured/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_configured/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -14,56 +14,58 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-find_package(CURL REQUIRED)
-find_package(LibXml2 REQUIRED)
-
-include_directories("${CURL_INCLUDE_DIR}")
-include_directories("${LIBXML2_INCLUDE_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery_configured/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-include_directories(private/include)
-
-SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_configured")
-SET(BUNDLE_VERSION "0.0.1")
-SET_HEADERS("Bundle-Name: Apache Celix RSA Configured Discovery")
-
-bundle(discovery_configured SOURCES
- private/src/discovery_impl.c
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/discovery_activator.c
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/discovery.c
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_reader.c
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_writer.c
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_discovery_poller.c
- ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_discovery_server.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c
- ${PROJECT_SOURCE_DIR}/remote_services/utils/private/src/civetweb.c
-
- ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
-)
-
-install_bundle(discovery_configured)
-
-target_link_libraries(discovery_configured celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${APRUTIL_LIBRARY})
-
-if (RSA_ENDPOINT_TEST_READER)
- add_executable(descparser
+celix_subproject(RSA_DISCOVERY_CONFIGURED "Option to enable building the Discovery (Configured) bundle" OFF)
+if (RSA_DISCOVERY_CONFIGURED)
+ find_package(CURL REQUIRED)
+ find_package(LibXml2 REQUIRED)
+
+ include_directories("${CURL_INCLUDE_DIR}")
+ include_directories("${LIBXML2_INCLUDE_DIR}")
+ include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery_configured/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
+ include_directories(private/include)
+
+ SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_configured")
+ SET(BUNDLE_VERSION "0.0.1")
+ SET_HEADERS("Bundle-Name: Apache Celix RSA Configured Discovery")
+
+ bundle(discovery_configured SOURCES
+ private/src/discovery_impl.c
+ ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/discovery_activator.c
+ ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/discovery.c
${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_reader.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c)
-
- target_link_libraries(descparser ${LIBXML2_LIBRARIES} celix_framework celix_utils)
-endif (RSA_ENDPOINT_TEST_READER)
-
-if (RSA_ENDPOINT_TEST_WRITER)
- add_executable(descwriter
${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_writer.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c)
-
- target_link_libraries(descwriter ${LIBXML2_LIBRARIES} celix_framework celix_utils)
-endif(RSA_ENDPOINT_TEST_WRITER)
\ No newline at end of file
+ ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_discovery_poller.c
+ ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_discovery_server.c
+ ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c
+ ${PROJECT_SOURCE_DIR}/remote_services/utils/private/src/civetweb.c
+
+ ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
+ )
+
+ install_bundle(discovery_configured)
+
+ target_link_libraries(discovery_configured celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${APRUTIL_LIBRARY})
+
+ if (RSA_ENDPOINT_TEST_READER)
+ add_executable(descparser
+ ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_reader.c
+ ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c)
+
+ target_link_libraries(descparser ${LIBXML2_LIBRARIES} celix_framework celix_utils)
+ endif (RSA_ENDPOINT_TEST_READER)
+
+ if (RSA_ENDPOINT_TEST_WRITER)
+ add_executable(descwriter
+ ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/src/endpoint_descriptor_writer.c
+ ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/endpoint_description.c)
+
+ target_link_libraries(descwriter ${LIBXML2_LIBRARIES} celix_framework celix_utils)
+ endif(RSA_ENDPOINT_TEST_WRITER)
+endif (RSA_DISCOVERY_CONFIGURED)
\ No newline at end of file
Modified: celix/trunk/remote_services/discovery_etcd/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_etcd/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_etcd/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_etcd/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
-if (RSA_BUNDLES_DISCOVERY_ETCD)
+celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" OFF)
+if (RSA_DISCOVERY_ETCD)
find_package(CURL REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Jansson REQUIRED)
@@ -59,4 +59,4 @@ if (RSA_BUNDLES_DISCOVERY_ETCD)
target_link_libraries(discovery_etcd celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES})
-endif (RSA_BUNDLES_DISCOVERY_ETCD)
+endif (RSA_DISCOVERY_ETCD)
Modified: celix/trunk/remote_services/discovery_shm/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_shm/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_shm/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_shm/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_DISCOVERY_SHM "Option to enable building the Discovery (SHM) bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
-if (RSA_BUNDLES_DISCOVERY_SHM)
+celix_subproject(RSA_DISCOVERY_SHM "Option to enable building the Discovery (SHM) bundle" OFF)
+if (RSA_DISCOVERY_SHM)
find_package(CURL REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Jansson REQUIRED)
@@ -56,4 +56,4 @@ find_package(CURL REQUIRED)
target_link_libraries(discovery_shm celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES})
-endif (RSA_BUNDLES_DISCOVERY_SHM)
+endif (RSA_DISCOVERY_SHM)
Copied: celix/trunk/remote_services/examples/CMakeLists.txt (from r1660583, celix/trunk/remote_services/CMakeLists.txt)
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/CMakeLists.txt?p2=celix/trunk/remote_services/examples/CMakeLists.txt&p1=celix/trunk/remote_services/CMakeLists.txt&r1=1660583&r2=1660605&rev=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -15,36 +15,17 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(REMOTE_SERVICE_ADMIN "Option to enable building the Remote Service Admin Service bundles" OFF DEPS LAUNCHER shell_tui log_writer)
-if (REMOTE_SERVICE_ADMIN)
- # Add -fPIC for x86_64 Unix platforms; this lib will be linked to a shared lib
- if(UNIX AND NOT WIN32)
- find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
- if(CMAKE_UNAME)
- exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
- set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
- add_definitions(-fPIC)
- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
- endif(CMAKE_UNAME)
- endif(UNIX AND NOT WIN32)
-
- add_subdirectory(topology_manager)
- 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)
-
+celix_subproject(RSA_EXAMPLES "Option to enable building the RSA examples" OFF DEPS LAUNCHER shell_tui log_writer RSA_TOPOLOGY_MANAGER)
+if (RSA_EXAMPLES)
add_subdirectory(calculator_service)
+
add_subdirectory(calculator_endpoint)
add_subdirectory(calculator_endpoint2)
+
add_subdirectory(calculator_proxy)
add_subdirectory(calculator_proxy2)
+
add_subdirectory(calculator_shell)
-endif (REMOTE_SERVICE_ADMIN)
+endif (RSA_EXAMPLES)
Modified: celix/trunk/remote_services/examples/calculator_endpoint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/calculator_endpoint/CMakeLists.txt?rev=1660605&r1=1660583&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/examples/calculator_endpoint/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/calculator_endpoint/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -18,10 +18,10 @@
find_package(Jansson REQUIRED)
include_directories("${JANSSON_INCLUDE_DIRS}")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_endpoint/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
+include_directories("../../../utils/public/include")
+include_directories("../../remote_service_admin/public/include")
+include_directories("../calculator_service/public/include")
+include_directories("private/include")
SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_endpoint")
SET(BUNDLE_VERSION "0.0.1")
Modified: celix/trunk/remote_services/examples/calculator_endpoint2/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/calculator_endpoint2/CMakeLists.txt?rev=1660605&r1=1660583&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/examples/calculator_endpoint2/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/calculator_endpoint2/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -18,10 +18,10 @@
find_package(Jansson REQUIRED)
include_directories("${JANSSON_INCLUDE_DIRS}")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_endpoint2/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
+include_directories("../../../utils/public/include")
+include_directories("../../remote_service_admin/public/include")
+include_directories("../calculator_service/public/include")
+include_directories("private/include")
SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator2_endpoint")
SET(BUNDLE_VERSION "0.0.1")
Modified: celix/trunk/remote_services/examples/calculator_proxy/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/calculator_proxy/CMakeLists.txt?rev=1660605&r1=1660583&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/examples/calculator_proxy/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/calculator_proxy/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -18,11 +18,11 @@
find_package(Jansson REQUIRED)
include_directories("${JANSSON_INCLUDE_DIRS}")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_proxy/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+include_directories("../../../utils/public/include")
+include_directories("../../remote_service_admin/public/include")
+include_directories("private/include")
+include_directories("../calculator_service/public/include")
+include_directories("../../endpoint_listener/public/include")
SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_proxy")
SET(BUNDLE_VERSION "0.0.1")
@@ -30,7 +30,7 @@ SET(BUNDLE_VERSION "0.0.1")
bundle(org.apache.celix.calc.api.Calculator_proxy SOURCES
private/src/calculator_proxy_activator
private/src/calculator_proxy_impl.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/remote_proxy_factory_impl.c
+ ../../remote_service_admin/private/src/remote_proxy_factory_impl.c
private/include/calculator_proxy_impl.h
)
Modified: celix/trunk/remote_services/examples/calculator_proxy2/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/calculator_proxy2/CMakeLists.txt?rev=1660605&r1=1660583&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/examples/calculator_proxy2/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/calculator_proxy2/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -18,11 +18,11 @@
find_package(Jansson REQUIRED)
include_directories("${JANSSON_INCLUDE_DIRS}")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_proxy/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+include_directories("../../../utils/public/include")
+include_directories("../../remote_service_admin/public/include")
+include_directories("private/include")
+include_directories("../calculator_service/public/include")
+include_directories("../../endpoint_listener/public/include")
SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator2_proxy")
SET(BUNDLE_VERSION "0.0.1")
@@ -30,7 +30,7 @@ SET(BUNDLE_VERSION "0.0.1")
bundle(org.apache.celix.calc.api.Calculator2_proxy SOURCES
private/src/calculator_proxy_activator
private/src/calculator_proxy_impl.c
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/remote_proxy_factory_impl.c
+ ../../remote_service_admin/private/src/remote_proxy_factory_impl.c
private/include/calculator_proxy_impl.h
)
Modified: celix/trunk/remote_services/examples/calculator_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/calculator_service/CMakeLists.txt?rev=1660605&r1=1660583&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/examples/calculator_service/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/calculator_service/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
+include_directories("../../../utils/public/include")
+include_directories("../../utils/public/include")
+include_directories("../../remote_service_admin/public/include")
+include_directories("private/include")
+include_directories("public/include")
SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_impl")
SET(BUNDLE_VERSION "0.0.1")
Modified: celix/trunk/remote_services/examples/calculator_shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/calculator_shell/CMakeLists.txt?rev=1660605&r1=1660583&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/examples/calculator_shell/CMakeLists.txt (original)
+++ celix/trunk/remote_services/examples/calculator_shell/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_shell/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/calculator_service/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/shell/public/include")
+include_directories("private/include")
+include_directories("../../../utils/public/include")
+include_directories("../calculator_service/public/include")
+include_directories("../../../shell/public/include")
SET(BUNDLE_SYMBOLICNAME "apache_celix_remoting_calculator_shell")
SET(BUNDLE_VERSION "0.0.1")
@@ -32,7 +32,7 @@ bundle(calculator_shell SOURCES
private/include/add_command.h
private/include/sqrt_command.h
private/include/sub_command.h
- ${PROJECT_SOURCE_DIR}/shell/public/src/command.c
+ ../../../shell/public/src/command.c
)
target_link_libraries(calculator_shell celix_framework)
Copied: celix/trunk/remote_services/examples/deploy.cmake (from r1660583, celix/trunk/remote_services/deploy.cmake)
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/examples/deploy.cmake?p2=celix/trunk/remote_services/examples/deploy.cmake&p1=celix/trunk/remote_services/deploy.cmake&r1=1660583&r2=1660605&rev=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/deploy.cmake (original)
+++ celix/trunk/remote_services/examples/deploy.cmake Wed Feb 18 12:02:07 2015
@@ -14,54 +14,38 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-is_enabled(REMOTE_SERVICE_ADMIN)
-if (REMOTE_SERVICE_ADMIN)
- deploy("remote-services-cfg" BUNDLES discovery_configured topology_manager remote_service_admin_http calculator shell shell_tui log_service log_writer
- ENDPOINTS
- org.apache.celix.calc.api.Calculator_endpoint
- org.apache.celix.calc.api.Calculator2_endpoint)
- deploy("remote-services-cfg-client" BUNDLES topology_manager remote_service_admin_http shell shell_tui log_service log_writer calculator_shell discovery_configured
- ENDPOINTS org.apache.celix.calc.api.Calculator_proxy org.apache.celix.calc.api.Calculator2_proxy)
-
- #TODO for remote-service-client the discovery should be added as last. If this is not done,
- #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)
- if (RSA_BUNDLES_DISCOVERY_SHM)
+is_enabled(RSA_EXAMPLES)
+if (RSA_EXAMPLES)
+ is_enabled(RSA_REMOTE_SERVICE_ADMIN_HTTP)
+ if (RSA_REMOTE_SERVICE_ADMIN_HTTP)
+ is_enabled(RSA_DISCOVERY_CONFIGURED)
+ if (RSA_DISCOVERY_CONFIGURED)
+ deploy("remote-services-cfg" BUNDLES discovery_configured topology_manager remote_service_admin_http calculator shell shell_tui log_service log_writer
+ ENDPOINTS
+ org.apache.celix.calc.api.Calculator_endpoint
+ org.apache.celix.calc.api.Calculator2_endpoint)
+ deploy("remote-services-cfg-client" BUNDLES topology_manager remote_service_admin_http shell shell_tui log_service log_writer calculator_shell discovery_configured
+ ENDPOINTS org.apache.celix.calc.api.Calculator_proxy org.apache.celix.calc.api.Calculator2_proxy)
+ endif ()
+ endif ()
+
+ is_enabled(RSA_REMOTE_SERVICE_ADMIN_SHM)
+ if (RSA_REMOTE_SERVICE_ADMIN_SHM)
+ is_enabled(RSA_DISCOVERY_SHM)
+ if (RSA_DISCOVERY_SHM)
deploy("remote-services-shm" BUNDLES discovery_shm topology_manager remote_service_admin_shm calculator shell shell_tui log_service log_writer
ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
deploy("remote-services-shm-client" BUNDLES topology_manager remote_service_admin_shm shell shell_tui log_service log_writer calculator_shell discovery_shm
ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
- endif (RSA_BUNDLES_DISCOVERY_SHM)
- endif (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+ endif ()
+ endif ()
- is_enabled(RSA_BUNDLES_DISCOVERY_ETCD)
- if (RSA_BUNDLES_DISCOVERY_ETCD)
+ is_enabled(RSA_DISCOVERY_ETCD)
+ if (RSA_DISCOVERY_ETCD)
deploy("remote-services-etcd" BUNDLES discovery_etcd 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-etcd-client" BUNDLES topology_manager remote_service_admin_http shell shell_tui log_service log_writer calculator_shell discovery_etcd
ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
- endif (RSA_BUNDLES_DISCOVERY_ETCD)
+ endif ()
-endif (REMOTE_SERVICE_ADMIN)
+endif (RSA_EXAMPLES)
Modified: celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt (original)
+++ celix/trunk/remote_services/remote_service_admin_http/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -14,33 +14,34 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+celix_subproject(RSA_REMOTE_SERVICE_ADMIN_HTTP "Option to enable building the Remote Service Admin Service HTTP bundle" OFF)
+if (RSA_REMOTE_SERVICE_ADMIN_HTTP)
+ find_package(CURL REQUIRED)
+
+ include_directories(${CURL_INCLUDE_DIRS})
+ include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+
+ SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_http")
+ SET(BUNDLE_VERSION "0.0.1")
+ SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP")
-
-find_package(CURL REQUIRED)
-
-include_directories(${CURL_INCLUDE_DIRS})
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
-
-SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_http")
-SET(BUNDLE_VERSION "0.0.1")
-SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP")
-
-bundle(remote_service_admin_http SOURCES
+ bundle(remote_service_admin_http SOURCES
private/src/remote_service_admin_impl
private/src/remote_service_admin_activator
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/export_registration_impl
- ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/import_registration_impl
+ ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/export_registration_impl
+ ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/import_registration_impl
${PROJECT_SOURCE_DIR}/remote_services/utils/private/src/civetweb.c
${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
-)
+ )
+
+ install_bundle(remote_service_admin_http)
-install_bundle(remote_service_admin_http)
-
-target_link_libraries(remote_service_admin_http celix_framework ${CURL_LIBRARIES})
+ target_link_libraries(remote_service_admin_http celix_framework ${CURL_LIBRARIES})
+endif (RSA_REMOTE_SERVICE_ADMIN_HTTP)
\ No newline at end of file
Modified: celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt (original)
+++ celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM "Option to enable building the Remote Service Admin Service SHM bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
-if (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+celix_subproject(RSA_REMOTE_SERVICE_ADMIN_SHM "Option to enable building the Remote Service Admin Service SHM bundle" OFF)
+if (RSA_REMOTE_SERVICE_ADMIN_SHM)
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -47,5 +47,5 @@ if (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM
)
target_link_libraries(remote_service_admin_shm celix_framework ${APRUTIL_LIBRARY})
-endif (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+endif (RSA_REMOTE_SERVICE_ADMIN_SHM)
Modified: celix/trunk/remote_services/topology_manager/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/topology_manager/CMakeLists.txt?rev=1660605&r1=1660604&r2=1660605&view=diff
==============================================================================
--- celix/trunk/remote_services/topology_manager/CMakeLists.txt (original)
+++ celix/trunk/remote_services/topology_manager/CMakeLists.txt Wed Feb 18 12:02:07 2015
@@ -14,27 +14,29 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+celix_subproject(RSA_TOPOLOGY_MANAGER "Option to enable building the Remote Service Admin Service SHM bundle" ON)
+if (RSA_TOPOLOGY_MANAGER)
+ include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/topology_manager/private/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+ include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/topology_manager/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-
-SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rs_topology_manager")
-SET(BUNDLE_VERSION "0.0.1")
-SET_HEADERS("Bundle-Name: Apache Celix RS Topology Manager")
-
-bundle(topology_manager SOURCES
- private/src/topology_manager
- private/src/activator
-
- ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
-
- private/include/topology_manager.h
-)
+ SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rs_topology_manager")
+ SET(BUNDLE_VERSION "0.0.1")
+ SET_HEADERS("Bundle-Name: Apache Celix RS Topology Manager")
-install_bundle(topology_manager)
+ bundle(topology_manager SOURCES
+ private/src/topology_manager
+ private/src/activator
-target_link_libraries(topology_manager celix_framework ${APRUTIL_LIBRARY})
+ ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
+
+ private/include/topology_manager.h
+ )
+
+ install_bundle(topology_manager)
+
+ target_link_libraries(topology_manager celix_framework ${APRUTIL_LIBRARY})
+endif (RSA_TOPOLOGY_MANAGER)