incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1528071 [3/3] - in /incubator/celix/trunk: cmake/ doap/ examples/ examples/mongoose/private/include/ examples/mongoose/private/src/ examples/osgi-in-action/chapter04-correct-lookup/private/src/ framework/ framework/public/include/ utils/
Date Tue, 01 Oct 2013 12:47:43 GMT
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c?rev=1528071&r1=1528070&r2=1528071&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
(original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
Tue Oct  1 12:47:43 2013
@@ -89,7 +89,7 @@ celix_status_t bundleActivator_destroy(v
 //  The rest of this is just support code, not meant to show any particular best practices
 //------------------------------------------------------------------------------------------
 
-// Test LogService by periodically sending a message
+// Test LogService by periodically sending a message
 void *APR_THREAD_FUNC LogServiceTest(apr_thread_t *thd, void *argument) {
 	celix_status_t status = CELIX_SUCCESS;
 	thread_data_pt data = (thread_data_pt) argument;

Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1528071&r1=1528070&r2=1528071&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Tue Oct  1 12:47:43 2013
@@ -1,73 +1,73 @@
-# 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.
-
-celix_subproject(FRAMEWORK "Option to build the framework shared library" "ON" DEPS UTILS)
-if (FRAMEWORK) 
-    cmake_minimum_required(VERSION 2.6)
-    
-    find_package(ZLIB REQUIRED)
-    
-    include(CPackComponent)
-    
-    #cpack_add_component(framework
-    #	DISPLAY_NAME Framework
-    #    DESCRIPTION "The Apache Celix framework library"
-    #    REQUIRED
-    #)
-    
-    CELIX_ADD_COMPONENT(framework
-    	DISPLAY_NAME Framework
-        DESCRIPTION "The Apache Celix framework library"
-        GROUP all
-    )
-    
-    add_definitions(-DUSE_FILE32API)
-    include_directories(${ZLIB_INCLUDE_DIR})
-    include_directories("private/include")
-    include_directories("public/include")
-    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-
-	if(WIN32)
-	  set(IO private/src/iowin32.c)
-	endif(WIN32)
-
-    add_library(celix_framework SHARED
-	 private/src/attribute.c private/src/bundle.c private/src/bundle_archive.c private/src/bundle_cache.c
-	 private/src/bundle_context.c private/src/bundle_revision.c private/src/capability.c private/src/celix_errorcodes.c
-	 private/src/filter.c private/src/framework.c private/src/manifest.c private/src/ioapi.c
-	 private/src/manifest_parser.c private/src/miniunz.c private/src/module.c private/src/properties.c

-	 private/src/requirement.c private/src/resolver.c private/src/service_reference.c private/src/service_registration.c

-	 private/src/service_registry.c private/src/service_tracker.c private/src/service_tracker_customizer.c
-	 private/src/unzip.c private/src/utils.c private/src/version.c private/src/version_range.c
private/src/wire.c
-
-	 private/include/attribute.h public/include/framework_exports.h
-
-	 public/include/framework.h public/include/properties.h public/include/bundle_context.h
public/include/bundle.h
-	 public/include/bundle_activator.h public/include/service_registration.h public/include/service_reference.h
-	 public/include/bundle_archive.h public/include/utils.h public/include/module.h public/include/service_tracker.h
-	 public/include/service_tracker_customizer.h
-	 
-		${IO}
-	 
-	)
-    target_link_libraries(celix_framework celix_utils ${ZLIB_LIBRARY} ${APR_LIBRARY} ${APRUTIL_LIBRARY})
-    
-    install(TARGETS celix_framework DESTINATION lib COMPONENT framework)
-    FILE(GLOB files "public/include/*.h")
-    INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
-    
-endif (FRAMEWORK)
+# 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.
+
+celix_subproject(FRAMEWORK "Option to build the framework shared library" "ON" DEPS UTILS)
+if (FRAMEWORK) 
+    cmake_minimum_required(VERSION 2.6)
+    
+    find_package(ZLIB REQUIRED)
+    
+    include(CPackComponent)
+    
+    #cpack_add_component(framework
+    #	DISPLAY_NAME Framework
+    #    DESCRIPTION "The Apache Celix framework library"
+    #    REQUIRED
+    #)
+    
+    CELIX_ADD_COMPONENT(framework
+    	DISPLAY_NAME Framework
+        DESCRIPTION "The Apache Celix framework library"
+        GROUP all
+    )
+    
+    add_definitions(-DUSE_FILE32API)
+    include_directories(${ZLIB_INCLUDE_DIR})
+    include_directories("private/include")
+    include_directories("public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+
+	if(WIN32)
+	  set(IO private/src/iowin32.c)
+	endif(WIN32)
+
+    add_library(celix_framework SHARED
+	 private/src/attribute.c private/src/bundle.c private/src/bundle_archive.c private/src/bundle_cache.c
+	 private/src/bundle_context.c private/src/bundle_revision.c private/src/capability.c private/src/celix_errorcodes.c
+	 private/src/filter.c private/src/framework.c private/src/manifest.c private/src/ioapi.c
+	 private/src/manifest_parser.c private/src/miniunz.c private/src/module.c private/src/properties.c

+	 private/src/requirement.c private/src/resolver.c private/src/service_reference.c private/src/service_registration.c

+	 private/src/service_registry.c private/src/service_tracker.c private/src/service_tracker_customizer.c
+	 private/src/unzip.c private/src/utils.c private/src/version.c private/src/version_range.c
private/src/wire.c
+
+	 private/include/attribute.h public/include/framework_exports.h
+
+	 public/include/framework.h public/include/properties.h public/include/bundle_context.h
public/include/bundle.h
+	 public/include/bundle_activator.h public/include/service_registration.h public/include/service_reference.h
+	 public/include/bundle_archive.h public/include/utils.h public/include/module.h public/include/service_tracker.h
+	 public/include/service_tracker_customizer.h
+	 
+		${IO}
+	 
+	)
+    target_link_libraries(celix_framework celix_utils ${ZLIB_LIBRARY} ${APR_LIBRARY} ${APRUTIL_LIBRARY})
+    
+    install(TARGETS celix_framework DESTINATION lib COMPONENT framework)
+    FILE(GLOB files "public/include/*.h")
+    INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
+    
+endif (FRAMEWORK)

Modified: incubator/celix/trunk/framework/public/include/celixbool.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/celixbool.h?rev=1528071&r1=1528070&r2=1528071&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/celixbool.h (original)
+++ incubator/celix/trunk/framework/public/include/celixbool.h Tue Oct  1 12:47:43 2013
@@ -1,61 +1,61 @@
-/*
- *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.
- */
-/*
- * celixbool.h
- *
- *  \date       Jun 16, 2011
- *  \author    	<a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
- *  \copyright	Apache License, Version 2.0
- */
-
-#ifndef CELIXBOOL_H_
-#define CELIXBOOL_H_
-
-
-#if defined(__STDC__)
-# define C89
-# if defined(__STDC_VERSION__)
-#  define C90
-#  if (__STDC_VERSION__ >= 199409L)
-#   define C94
-#  endif
-#  if (__STDC_VERSION__ >= 199901L)
-#   define C99
-#  endif
-# endif
-#endif
-
-
-#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
-// #ifndef C99
-
-typedef int _Bool;
-
-#define bool _Bool
-#define false 0 
-#define true 1
-
-
-#else
-
-#include <stdbool.h>
-
-#endif
-
-#endif /* CELIXBOOL_H_ */
+/*
+ *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.
+ */
+/*
+ * celixbool.h
+ *
+ *  \date       Jun 16, 2011
+ *  \author    	<a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
+ *  \copyright	Apache License, Version 2.0
+ */
+
+#ifndef CELIXBOOL_H_
+#define CELIXBOOL_H_
+
+
+#if defined(__STDC__)
+# define C89
+# if defined(__STDC_VERSION__)
+#  define C90
+#  if (__STDC_VERSION__ >= 199409L)
+#   define C94
+#  endif
+#  if (__STDC_VERSION__ >= 199901L)
+#   define C99
+#  endif
+# endif
+#endif
+
+
+#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
+// #ifndef C99
+
+typedef int _Bool;
+
+#define bool _Bool
+#define false 0 
+#define true 1
+
+
+#else
+
+#include <stdbool.h>
+
+#endif
+
+#endif /* CELIXBOOL_H_ */

Modified: incubator/celix/trunk/framework/public/include/framework_exports.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/public/include/framework_exports.h?rev=1528071&r1=1528070&r2=1528071&view=diff
==============================================================================
--- incubator/celix/trunk/framework/public/include/framework_exports.h (original)
+++ incubator/celix/trunk/framework/public/include/framework_exports.h Tue Oct  1 12:47:43
2013
@@ -1,46 +1,46 @@
-/**
- *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.
- */
-/*
- * exports.h
- */
-
-#ifndef FRAMEWORK_EXPORTS_H_
-#define FRAMEWORK_EXPORTS_H_
-
-/* Cmake will define celix_framework_EXPORTS on Windows when it
-configures to build a shared library. If you are going to use
-another build system on windows or create the visual studio
-projects by hand you need to define celix_framework_EXPORTS when
-building a DLL on windows.
-*/
-// We are using the Visual Studio Compiler and building Shared libraries
-
-#if defined (_WIN32)
-	#define  ACTIVATOR_EXPORT __declspec(dllexport)
-  #if defined(celix_framework_EXPORTS)
-    #define  FRAMEWORK_EXPORT __declspec(dllexport)
-  #else
-    #define  FRAMEWORK_EXPORT __declspec(dllimport)
-  #endif /* framework_EXPORTS */
-#else /* defined (_WIN32) */
-#define FRAMEWORK_EXPORT __attribute__((visibility("default")))
-#define ACTIVATOR_EXPORT __attribute__((visibility("default")))
-#endif
-
-#endif /* FRAMEWORK_EXPORTS_H_ */
+/**
+ *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.
+ */
+/*
+ * exports.h
+ */
+
+#ifndef FRAMEWORK_EXPORTS_H_
+#define FRAMEWORK_EXPORTS_H_
+
+/* Cmake will define celix_framework_EXPORTS on Windows when it
+configures to build a shared library. If you are going to use
+another build system on windows or create the visual studio
+projects by hand you need to define celix_framework_EXPORTS when
+building a DLL on windows.
+*/
+// We are using the Visual Studio Compiler and building Shared libraries
+
+#if defined (_WIN32)
+	#define  ACTIVATOR_EXPORT __declspec(dllexport)
+  #if defined(celix_framework_EXPORTS)
+    #define  FRAMEWORK_EXPORT __declspec(dllexport)
+  #else
+    #define  FRAMEWORK_EXPORT __declspec(dllimport)
+  #endif /* framework_EXPORTS */
+#else /* defined (_WIN32) */
+#define FRAMEWORK_EXPORT __attribute__((visibility("default")))
+#define ACTIVATOR_EXPORT __attribute__((visibility("default")))
+#endif
+
+#endif /* FRAMEWORK_EXPORTS_H_ */

Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1528071&r1=1528070&r2=1528071&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Tue Oct  1 12:47:43 2013
@@ -1,73 +1,73 @@
-# 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.
-
-celix_subproject(UTILS "Option to build the utilities library" "ON")
-if (UTILS) 
-    cmake_minimum_required(VERSION 2.6)
-    
-    add_definitions(-DUSE_FILE32API)
-    #aux_source_directory("private/src" SRC)
-    include_directories("private/include")
-    include_directories("public/include")
-    add_library(celix_utils SHARED 
-		private/src/array_list.c
-		public/include/array_list.h 
-		private/include/array_list_private.h 
-
-		private/src/hash_map.c
-		public/include/hash_map.h 
-		private/include/hash_map_private.h
-
-		private/src/linkedlist.c
-		private/src/linked_list_iterator.c
-		public/include/linkedlist.h
-		public/include/linked_list_iterator.h 
-		private/include/linked_list_private.h
-		
-		public/include/exports.h
-	)
-    
-    IF(UNIX)
-    	target_link_libraries(celix_utils m)
-    ENDIF(UNIX)
-    target_link_libraries(celix_utils ${APR_LIBRARY})
-    
-    install(TARGETS celix_utils DESTINATION lib COMPONENT framework)
-    FILE(GLOB files "public/include/*.h")
-    INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
-    
-    include_directories(${CUNIT_INCLUDE_DIRS})
-    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-    include_directories("${PROJECT_SOURCE_DIR}/utils/private/include")
-    
-    add_executable(hash_map_test private/test/hash_map_test.c)
-    target_link_libraries(hash_map_test celix_utils ${CUNIT_LIBRARIES})
-    
-    add_executable(hash_map_test_hash private/test/hash_map_test_hash.c)
-    target_link_libraries(hash_map_test_hash celix_utils ${CUNIT_LIBRARIES})
-    
-    add_executable(array_list_test private/test/array_list_test.c)
-    target_link_libraries(array_list_test celix_utils ${CUNIT_LIBRARIES})
-    
-    add_executable(linked_list_test private/test/linked_list_test.c)
-    target_link_libraries(linked_list_test celix_utils ${CUNIT_LIBRARIES})
-    
-    run_test(array_list_test)
-    run_test(hash_map_test)
-    run_test(hash_map_test_hash)
-    run_test(linked_list_test)
-endif (UTILS)
+# 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.
+
+celix_subproject(UTILS "Option to build the utilities library" "ON")
+if (UTILS) 
+    cmake_minimum_required(VERSION 2.6)
+    
+    add_definitions(-DUSE_FILE32API)
+    #aux_source_directory("private/src" SRC)
+    include_directories("private/include")
+    include_directories("public/include")
+    add_library(celix_utils SHARED 
+		private/src/array_list.c
+		public/include/array_list.h 
+		private/include/array_list_private.h 
+
+		private/src/hash_map.c
+		public/include/hash_map.h 
+		private/include/hash_map_private.h
+
+		private/src/linkedlist.c
+		private/src/linked_list_iterator.c
+		public/include/linkedlist.h
+		public/include/linked_list_iterator.h 
+		private/include/linked_list_private.h
+		
+		public/include/exports.h
+	)
+    
+    IF(UNIX)
+    	target_link_libraries(celix_utils m)
+    ENDIF(UNIX)
+    target_link_libraries(celix_utils ${APR_LIBRARY})
+    
+    install(TARGETS celix_utils DESTINATION lib COMPONENT framework)
+    FILE(GLOB files "public/include/*.h")
+    INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
+    
+    include_directories(${CUNIT_INCLUDE_DIRS})
+    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/utils/private/include")
+    
+    add_executable(hash_map_test private/test/hash_map_test.c)
+    target_link_libraries(hash_map_test celix_utils ${CUNIT_LIBRARIES})
+    
+    add_executable(hash_map_test_hash private/test/hash_map_test_hash.c)
+    target_link_libraries(hash_map_test_hash celix_utils ${CUNIT_LIBRARIES})
+    
+    add_executable(array_list_test private/test/array_list_test.c)
+    target_link_libraries(array_list_test celix_utils ${CUNIT_LIBRARIES})
+    
+    add_executable(linked_list_test private/test/linked_list_test.c)
+    target_link_libraries(linked_list_test celix_utils ${CUNIT_LIBRARIES})
+    
+    run_test(array_list_test)
+    run_test(hash_map_test)
+    run_test(hash_map_test_hash)
+    run_test(linked_list_test)
+endif (UTILS)



Mime
View raw message