You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2015/11/03 16:10:11 UTC
[45/50] [abbrv] celix git commit: CELIX-119: APR removed from
framework. Some example/bundles still depend on APR and are disabled.
CELIX-119: APR removed from framework. Some example/bundles still depend on APR and are disabled.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/8473fd4f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/8473fd4f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/8473fd4f
Branch: refs/heads/master
Commit: 8473fd4fdd8db0554d481c3d1194c47c73a5a54b
Parents: 04b6862
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Nov 3 12:39:02 2015 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Nov 3 12:39:02 2015 +0100
----------------------------------------------------------------------
CMakeLists.txt | 16 +--
cmake/FindAPR.cmake | 111 -------------------
cmake/cmake_celix/Packaging.cmake | 4 +-
config.h.in | 31 ------
examples/CMakeLists.txt | 4 +-
framework/CMakeLists.txt | 5 +-
framework/private/src/bundle_context.c | 23 ----
framework/private/src/celix_launcher.c | 32 +-----
framework/public/include/bundle_context.h | 7 --
framework/public/include/framework.h | 7 --
.../discovery_configured/CMakeLists.txt | 2 +-
.../private/include/import_registration_impl.h | 1 -
.../remote_service_admin_shm/CMakeLists.txt | 2 +-
remote_services/topology_manager/CMakeLists.txt | 2 +-
scr/CMakeLists.txt | 2 +-
15 files changed, 12 insertions(+), 237 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a390f8..ece5748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,17 +65,6 @@ include(UseDoxygen)
# Default bundle version
set(DEFAULT_VERSION 1.0.0)
-option("WITH_APR" "Build Celix with APR support" "OFF")
-if(${WITH_APR})
- find_package(APR REQUIRED)
-
- include_directories(${APR_INCLUDE_DIR})
- include_directories(${APRUTIL_INCLUDE_DIR})
-endif()
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/celix COMPONENT framework)
-
## New sub project must use a buildoption to be able to enable/disable the project using the CMake Editor
## Sub projects depending on another sub project automatically enable these dependencies
## For this to work, the order off "add_subdirectory" has to be correct (ie backwards)
@@ -84,14 +73,15 @@ add_subdirectory(device_access)
add_subdirectory(deployment_admin)
add_subdirectory(remote_services)
add_subdirectory(remote_shell)
-add_subdirectory(shell_bonjour)
+#add_subdirectory(shell_bonjour) shell_bonjour is still based on APR and old shell command service
add_subdirectory(shell_tui)
add_subdirectory(shell)
add_subdirectory(log_writer)
add_subdirectory(log_service)
-add_subdirectory(event_admin)
+#add_subdirectory(event_admin) event_admin is still bases on APR
add_subdirectory(dependency_manager)
+#add_subdirectory(scr) scr still needs APR
add_subdirectory(launcher)
add_subdirectory(framework)
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/cmake/FindAPR.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindAPR.cmake b/cmake/FindAPR.cmake
deleted file mode 100644
index 8263a68..0000000
--- a/cmake/FindAPR.cmake
+++ /dev/null
@@ -1,111 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# - Find Apache Portable Runtime
-# Find the APR includes and libraries
-# This module defines
-# APR_INCLUDE_DIR and APRUTIL_INCLUDE_DIR, where to find apr.h, etc.
-# APR_LIBRARIES and APRUTIL_LIBRARIES, the libraries needed to use APR.
-# APR_FOUND and APRUTIL_FOUND, If false, do not try to use APR.
-# also defined, but not for general use are
-# APR_LIBRARY and APRUTIL_LIBRARY, where to find the APR library.
-
-# APR first.
-
-FIND_PATH(APR_INCLUDE_DIR apr.h
-/usr/local/include/apr-1
-/usr/local/include/apr-1.0
-/usr/include/apr-1
-/usr/include/apr-1.0
-/usr/local/apr/include/apr-1
-)
-
-SET(APR_NAMES ${APR_NAMES} apr-1)
-FIND_LIBRARY(APR_LIBRARY
- NAMES ${APR_NAMES}
- PATHS /usr/lib /usr/local/lib /usr/local/apr/lib
- )
-
-IF (APR_LIBRARY AND APR_INCLUDE_DIR)
- SET(APR_LIBRARIES ${APR_LIBRARY})
- SET(APR_FOUND "YES")
-ELSE (APR_LIBRARY AND APR_INCLUDE_DIR)
- SET(APR_FOUND "NO")
-ENDIF (APR_LIBRARY AND APR_INCLUDE_DIR)
-
-
-IF (APR_FOUND)
- IF (NOT APR_FIND_QUIETLY)
- MESSAGE(STATUS "Found APR: ${APR_LIBRARIES}")
- ENDIF (NOT APR_FIND_QUIETLY)
-ELSE (APR_FOUND)
- IF (APR_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find APR library")
- ENDIF (APR_FIND_REQUIRED)
-ENDIF (APR_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_APR_INCLUDE_PATH ${APR_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_APR_LIB_PATH ${APR_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
- APR_LIBRARY
- APR_INCLUDE_DIR
- )
-
-# Next, APRUTIL.
-
-FIND_PATH(APRUTIL_INCLUDE_DIR apu.h
-/usr/local/include/apr-1
-/usr/local/include/apr-1.0
-/usr/include/apr-1
-/usr/include/apr-1.0
-/usr/local/apr/include/apr-1
-)
-
-SET(APRUTIL_NAMES ${APRUTIL_NAMES} aprutil-1)
-FIND_LIBRARY(APRUTIL_LIBRARY
- NAMES ${APRUTIL_NAMES}
- PATHS /usr/lib /usr/local/lib /usr/local/apr/lib
- )
-
-IF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
- SET(APRUTIL_LIBRARIES ${APRUTIL_LIBRARY})
- SET(APRUTIL_FOUND "YES")
-ELSE (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
- SET(APRUTIL_FOUND "NO")
-ENDIF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
-
-
-IF (APRUTIL_FOUND)
- IF (NOT APRUTIL_FIND_QUIETLY)
- MESSAGE(STATUS "Found APRUTIL: ${APRUTIL_LIBRARIES}")
- ENDIF (NOT APRUTIL_FIND_QUIETLY)
-ELSE (APRUTIL_FOUND)
- IF (APRUTIL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find APRUTIL library")
- ENDIF (APRUTIL_FIND_REQUIRED)
-ENDIF (APRUTIL_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_APRUTIL_INCLUDE_PATH ${APRUTIL_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_APRUTIL_LIB_PATH ${APRUTIL_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
- APRUTIL_LIBRARY
- APRUTIL_INCLUDE_DIR
- )
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/cmake/cmake_celix/Packaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake
index 158092a..ed2a7fb 100644
--- a/cmake/cmake_celix/Packaging.cmake
+++ b/cmake/cmake_celix/Packaging.cmake
@@ -448,8 +448,6 @@ MACRO(deploy)
ENDIF(UNIX)
IF(WIN32)
- GET_FILENAME_COMPONENT(apr_path ${APR_LIBRARY} PATH)
- GET_FILENAME_COMPONENT(aprutil_path ${APRUTIL_LIBRARY} PATH)
GET_FILENAME_COMPONENT(zlib_path ${ZLIB_LIBRARY} PATH)
GET_FILENAME_COMPONENT(curl_path ${CURL_LIBRARY} PATH)
@@ -461,7 +459,7 @@ MACRO(deploy)
SET(celixframework_path "${PROJECT_BINARY_DIR}/framework/${CMAKE_BUILD_TYPE}")
ENDIF(CELIX_FOUND)
- SET(PATH "%PATH%;${apr_path};${aprutil_path};${zlib_path};${curl_path};${celixutils_path};${celixframework_path}")
+ SET(PATH "%PATH%;${zlib_path};${curl_path};${celixutils_path};${celixframework_path}")
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/vcxproj.user.in ${CMAKE_CURRENT_BINARY_DIR}/deploy_${DEPLOY_NAME}.vcxproj.user @ONLY)
ENDIF(WIN32)
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/config.h.in
----------------------------------------------------------------------
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 117699e..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements. See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership. The ASF licenses this file
- *to you under the Apache License, Version 2.0 (the
- *"License"); you may not use this file except in compliance
- *with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- *Unless required by applicable law or agreed to in writing,
- *software distributed under the License is distributed on an
- *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- *specific language governing permissions and limitations
- *under the License.
- */
-/*
- * framework.h
- *
- * \date Mar 27, 2015
- * \author <a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- * \copyright Apache License, Version 2.0
- */
-#ifndef CELIX_CONFIG_H
-#define CELIX_CONFIG_H
-
-#cmakedefine WITH_APR
-
-#endif //CELIX_CONFIG_H
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/examples/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index fc79400..677a6aa 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -31,7 +31,7 @@ if (EXAMPLES)
add_subdirectory(osgi-in-action/chapter04-correct-lookup)
add_subdirectory(osgi-in-action/chapter04-correct-listener)
add_subdirectory(osgi-in-action/chapter01-greeting-example)
- #add_subdirectory(osgi-in-action/chapter04-paint-example)
+ #add_subdirectory(osgi-in-action/chapter04-paint-example) chapter4 example is still based on APR
- #add_subdirectory(embedding)
+ #add_subdirectory(embedding) embedding is still baed on APR
endif(EXAMPLES)
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/framework/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 4ca323c..8af9586 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -72,10 +72,7 @@ if (FRAMEWORK)
if(NOT APPLE)
set(UUID ${UUID_LIBRARY})
endif()
- if (WITH_APR)
- set(APR ${APR_LIBRARY})
- endif()
- target_link_libraries(celix_framework celix_utils ${UUID} ${ZLIB_LIBRARY} ${APR} ${CURL_LIBRARIES})
+ target_link_libraries(celix_framework celix_utils ${UUID} ${ZLIB_LIBRARY} ${CURL_LIBRARIES})
install(TARGETS celix_framework DESTINATION lib COMPONENT framework)
FILE(GLOB files "public/include/*.h")
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/framework/private/src/bundle_context.c
----------------------------------------------------------------------
diff --git a/framework/private/src/bundle_context.c b/framework/private/src/bundle_context.c
index 76e377f..8a52790 100644
--- a/framework/private/src/bundle_context.c
+++ b/framework/private/src/bundle_context.c
@@ -32,11 +32,7 @@
#include "bundle.h"
#include "celix_log.h"
-#ifdef WITH_APR
-celix_status_t bundleContext_create(apr_pool_t *pool, framework_pt framework, framework_logger_pt logger, bundle_pt bundle, bundle_context_pt *bundle_context) {
-#else
celix_status_t bundleContext_create(framework_pt framework, framework_logger_pt logger, bundle_pt bundle, bundle_context_pt *bundle_context) {
-#endif
celix_status_t status = CELIX_SUCCESS;
bundle_context_pt context = NULL;
@@ -47,9 +43,6 @@ celix_status_t bundleContext_create(framework_pt framework, framework_logger_pt
if (!context) {
status = CELIX_ENOMEM;
} else {
-#ifdef WITH_APR
- context->pool = pool;
-#endif
context->framework = framework;
context->bundle = bundle;
context->logger = logger;
@@ -106,22 +99,6 @@ celix_status_t bundleContext_getFramework(bundle_context_pt context, framework_p
return status;
}
-#ifdef WITH_APR
-celix_status_t bundleContext_getMemoryPool(bundle_context_pt context, apr_pool_t **memory_pool) {
- celix_status_t status = CELIX_SUCCESS;
-
- if (context == NULL) {
- status = CELIX_ILLEGAL_ARGUMENT;
- } else {
- *memory_pool = context->pool;
- }
-
- framework_logIfError(logger, status, NULL, "Failed to get memory pool");
-
- return status;
-}
-#endif
-
celix_status_t bundleContext_installBundle(bundle_context_pt context, char * location, bundle_pt *bundle) {
return bundleContext_installBundle2(context, location, NULL, bundle);
}
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/framework/private/src/celix_launcher.c
----------------------------------------------------------------------
diff --git a/framework/private/src/celix_launcher.c b/framework/private/src/celix_launcher.c
index bc6bd34..c3dbb82 100644
--- a/framework/private/src/celix_launcher.c
+++ b/framework/private/src/celix_launcher.c
@@ -39,10 +39,6 @@
#include "framework.h"
#include "linked_list_iterator.h"
-#ifdef WITH_APR
-static apr_pool_t *memoryPool;
-#endif
-
int celixLauncher_launch(const char *configFile, framework_pt *framework) {
int status = 0;
FILE *config = fopen(configFile, "r");
@@ -69,37 +65,16 @@ int celixLauncher_launchWithStream(FILE *stream, framework_pt *framework) {
}
-#ifdef WITH_APR
- apr_status_t rv;
- apr_status_t s;
-#endif
-
#ifndef CELIX_NO_CURLINIT
// Before doing anything else, let's setup Curl
curl_global_init(CURL_GLOBAL_NOTHING);
#endif
-#ifdef WITH_APR
- rv = apr_initialize();
- if (rv != APR_SUCCESS) {
- return CELIX_START_ERROR;
- }
-
- s = apr_pool_create(&memoryPool, NULL);
- if (s != APR_SUCCESS) {
- return CELIX_START_ERROR;
- }
-#endif
-
if (status == 0) {
char *autoStart = properties_get(config, "cosgi.auto.start.1");
celix_status_t status;
-#ifdef WITH_APR
- status = framework_create(framework, memoryPool, config);
-#else
status = framework_create(framework, config);
-#endif
bundle_pt fwBundle = NULL;
if (status == CELIX_SUCCESS) {
status = fw_init(*framework);
@@ -170,11 +145,6 @@ void celixLauncher_waitForShutdown(framework_pt framework) {
void celixLauncher_destroy(framework_pt framework) {
framework_destroy(framework);
- #ifdef WITH_APR
- apr_pool_destroy(memoryPool);
- apr_terminate();
- #endif
-
#ifndef CELIX_NO_CURLINIT
// Cleanup Curl
curl_global_cleanup();
@@ -187,4 +157,4 @@ void celixLauncher_stop(framework_pt framework) {
bundle_pt fwBundle = NULL;
framework_getFrameworkBundle(framework, &fwBundle);
bundle_stop(fwBundle);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/framework/public/include/bundle_context.h
----------------------------------------------------------------------
diff --git a/framework/public/include/bundle_context.h b/framework/public/include/bundle_context.h
index 7ee860c..179e601 100644
--- a/framework/public/include/bundle_context.h
+++ b/framework/public/include/bundle_context.h
@@ -41,18 +41,11 @@ typedef struct bundleContext *bundle_context_pt;
#include "properties.h"
#include "array_list.h"
-#ifdef WITH_APR
-celix_status_t bundleContext_create(apr_pool_t *pool, framework_pt framework, framework_logger_pt, bundle_pt bundle, bundle_context_pt *bundle_context);
-#else
celix_status_t bundleContext_create(framework_pt framework, framework_logger_pt, bundle_pt bundle, bundle_context_pt *bundle_context);
-#endif
celix_status_t bundleContext_destroy(bundle_context_pt context);
FRAMEWORK_EXPORT celix_status_t bundleContext_getBundle(bundle_context_pt context, bundle_pt *bundle);
FRAMEWORK_EXPORT celix_status_t bundleContext_getFramework(bundle_context_pt context, framework_pt *framework);
-#ifdef WITH_APR
-FRAMEWORK_EXPORT celix_status_t bundleContext_getMemoryPool(bundle_context_pt context, apr_pool_t **memory_pool);
-#endif
FRAMEWORK_EXPORT celix_status_t bundleContext_installBundle(bundle_context_pt context, char * location, bundle_pt *bundle);
FRAMEWORK_EXPORT celix_status_t bundleContext_installBundle2(bundle_context_pt context, char * location, char *inputFile, bundle_pt *bundle);
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/framework/public/include/framework.h
----------------------------------------------------------------------
diff --git a/framework/public/include/framework.h b/framework/public/include/framework.h
index 0cd8c4d..e1133f7 100644
--- a/framework/public/include/framework.h
+++ b/framework/public/include/framework.h
@@ -31,9 +31,6 @@ typedef struct activator * activator_pt;
typedef struct framework * framework_pt;
#include "config.h"
-#ifdef WITH_APR
-#include <apr_general.h>
-#endif
#include "celix_errno.h"
#include "framework_exports.h"
@@ -41,11 +38,7 @@ typedef struct framework * framework_pt;
#include "properties.h"
// #TODO: Move to FrameworkFactory according the OSGi Spec
-#ifdef WITH_APR
-FRAMEWORK_EXPORT celix_status_t framework_create(framework_pt *framework, apr_pool_t *memoryPool, properties_pt config);
-#else
FRAMEWORK_EXPORT celix_status_t framework_create(framework_pt *framework, properties_pt config);
-#endif
FRAMEWORK_EXPORT celix_status_t framework_destroy(framework_pt framework);
FRAMEWORK_EXPORT celix_status_t fw_init(framework_pt framework);
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/remote_services/discovery_configured/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_configured/CMakeLists.txt b/remote_services/discovery_configured/CMakeLists.txt
index 9fc6a81..e414572 100644
--- a/remote_services/discovery_configured/CMakeLists.txt
+++ b/remote_services/discovery_configured/CMakeLists.txt
@@ -51,7 +51,7 @@ if (RSA_DISCOVERY_CONFIGURED)
install_bundle(discovery_configured)
- target_link_libraries(discovery_configured celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${APRUTIL_LIBRARY})
+ target_link_libraries(discovery_configured celix_framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
if (RSA_ENDPOINT_TEST_READER)
add_executable(descparser
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/remote_services/remote_service_admin/private/include/import_registration_impl.h
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin/private/include/import_registration_impl.h b/remote_services/remote_service_admin/private/include/import_registration_impl.h
index 2900888..7aa397f 100644
--- a/remote_services/remote_service_admin/private/include/import_registration_impl.h
+++ b/remote_services/remote_service_admin/private/include/import_registration_impl.h
@@ -71,7 +71,6 @@ celix_status_t importRegistration_getImportReference(import_registration_pt regi
celix_status_t importRegistration_createProxyFactoryTracker(import_registration_factory_pt registration_factory, service_tracker_pt *tracker);
-//celix_status_t importRegistrationFactory_create(apr_pool_t *pool, char* serviceName, bundle_context_pt context, import_registration_factory_pt *registration_factory);
celix_status_t importRegistrationFactory_destroy(import_registration_factory_pt* registration_factory);
//celix_status_t importRegistrationFactory_open(import_registration_factory_pt registration_factory);
celix_status_t importRegistrationFactory_close(import_registration_factory_pt registration_factory);
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/remote_services/remote_service_admin_shm/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_shm/CMakeLists.txt b/remote_services/remote_service_admin_shm/CMakeLists.txt
index d6b0dd6..a11f893 100644
--- a/remote_services/remote_service_admin_shm/CMakeLists.txt
+++ b/remote_services/remote_service_admin_shm/CMakeLists.txt
@@ -46,6 +46,6 @@ if (RSA_REMOTE_SERVICE_ADMIN_SHM)
${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/public/include/remote_service_admin_shm.h
)
- target_link_libraries(remote_service_admin_shm celix_framework ${APRUTIL_LIBRARY})
+ target_link_libraries(remote_service_admin_shm celix_framework)
endif (RSA_REMOTE_SERVICE_ADMIN_SHM)
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/remote_services/topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/CMakeLists.txt b/remote_services/topology_manager/CMakeLists.txt
index 10229de..27d8501 100644
--- a/remote_services/topology_manager/CMakeLists.txt
+++ b/remote_services/topology_manager/CMakeLists.txt
@@ -38,5 +38,5 @@ if (RSA_TOPOLOGY_MANAGER)
install_bundle(topology_manager)
- target_link_libraries(topology_manager celix_framework ${APRUTIL_LIBRARY})
+ target_link_libraries(topology_manager celix_framework)
endif (RSA_TOPOLOGY_MANAGER)
http://git-wip-us.apache.org/repos/asf/celix/blob/8473fd4f/scr/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/scr/CMakeLists.txt b/scr/CMakeLists.txt
index b7e8b3c..88c95a7 100644
--- a/scr/CMakeLists.txt
+++ b/scr/CMakeLists.txt
@@ -24,4 +24,4 @@ if (SCR)
deploy(scr-test BUNDLES shell shell_tui scr_test scr)
endif (SCR)
-
\ No newline at end of file
+