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 2012/08/09 23:07:11 UTC
svn commit: r1371483 [2/5] - in /incubator/celix/trunk: ./ cmake/
cmake/modules/ dependency_manager/ dependency_manager/private/
dependency_manager/private/src/ dependency_manager/public/
dependency_manager/public/include/ deployment_admin/ deployment_...
Modified: incubator/celix/trunk/device_access/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -14,6 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
celix_subproject(DEVICE_ACCESS "Option to enable building the Device Access Service bundles" OFF DEPS LAUNCHER LOG_SERVICE SHELL shell_tui)
if(DEVICE_ACCESS)
Modified: incubator/celix/trunk/device_access/device_access/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/device_access/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -14,7 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-include(FindAPR)
+
+find_package(APR REQUIRED)
bundle(device_manager SOURCES
private/src/activator
Modified: incubator/celix/trunk/device_access/device_access/private/include/device_manager.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/device_manager.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/device_manager.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/device_manager.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * device_manager.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DEVICE_MANAGER_H_
#define DEVICE_MANAGER_H_
Modified: incubator/celix/trunk/device_access/device_access/private/include/driver_attributes.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/driver_attributes.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/driver_attributes.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/driver_attributes.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_attributes.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_ATTRIBUTES_H_
#define DRIVER_ATTRIBUTES_H_
Modified: incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_loader.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_LOADER_H_
#define DRIVER_LOADER_H_
Modified: incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h (original)
+++ incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_matcher.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_MATCHER_H_
#define DRIVER_MATCHER_H_
Modified: incubator/celix/trunk/device_access/device_access/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
Modified: incubator/celix/trunk/device_access/device_access/private/src/device_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/device_manager.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/device_manager.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/device_manager.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * device_manager.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <constants.h>
#include <apr_general.h>
Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_attributes.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_loader.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_general.h>
#include <apr_strings.h>
Modified: incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c (original)
+++ incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_matcher.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include "hash_map.h"
Modified: incubator/celix/trunk/device_access/device_access/public/include/device.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/public/include/device.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/public/include/device.h (original)
+++ incubator/celix/trunk/device_access/device_access/public/include/device.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * device.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DEVICE_H_
#define DEVICE_H_
Modified: incubator/celix/trunk/device_access/device_access/public/include/driver.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/public/include/driver.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/public/include/driver.h (original)
+++ incubator/celix/trunk/device_access/device_access/public/include/driver.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_H_
#define DRIVER_H_
Modified: incubator/celix/trunk/device_access/device_access/public/include/driver_locator.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/public/include/driver_locator.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/public/include/driver_locator.h (original)
+++ incubator/celix/trunk/device_access/device_access/public/include/driver_locator.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_locator.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_LOCATOR_H_
#define DRIVER_LOCATOR_H_
Modified: incubator/celix/trunk/device_access/device_access/public/include/driver_selector.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/public/include/driver_selector.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/public/include/driver_selector.h (original)
+++ incubator/celix/trunk/device_access/device_access/public/include/driver_selector.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_selector.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_SELECTOR_H_
#define DRIVER_SELECTOR_H_
Modified: incubator/celix/trunk/device_access/device_access/public/include/match.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/public/include/match.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/public/include/match.h (original)
+++ incubator/celix/trunk/device_access/device_access/public/include/match.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * match.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef MATCH_H_
#define MATCH_H_
Modified: incubator/celix/trunk/device_access/driver_locator/private/include/driver_locator_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/private/include/driver_locator_private.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/private/include/driver_locator_private.h (original)
+++ incubator/celix/trunk/device_access/driver_locator/private/include/driver_locator_private.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_locator_private.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef DRIVER_LOCATOR_PRIVATE_H_
#define DRIVER_LOCATOR_PRIVATE_H_
Modified: incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/driver_locator/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
Modified: incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c (original)
+++ incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * driver_locator.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-include(FindAPR)
+find_package(APR REQUIRED)
bundle(base_driver SOURCES
private/src/activator
Modified: incubator/celix/trunk/device_access/example/base_driver/private/include/base_driver_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/private/include/base_driver_private.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/private/include/base_driver_private.h (original)
+++ incubator/celix/trunk/device_access/example/base_driver/private/include/base_driver_private.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * base_driver_private.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef BASE_DRIVER_PRIVATE_H_
#define BASE_DRIVER_PRIVATE_H_
Modified: incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
#include <apr_pools.h>
Modified: incubator/celix/trunk/device_access/example/base_driver/private/src/base_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/private/src/base_driver.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/private/src/base_driver.c (original)
+++ incubator/celix/trunk/device_access/example/base_driver/private/src/base_driver.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * base_driver.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
Modified: incubator/celix/trunk/device_access/example/base_driver/public/include/base_driver_device.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/public/include/base_driver_device.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/public/include/base_driver_device.h (original)
+++ incubator/celix/trunk/device_access/example/base_driver/public/include/base_driver_device.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * base_driver_device.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef BASE_DRIVER_DEVICE_H_
#define BASE_DRIVER_DEVICE_H_
Modified: incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -25,7 +25,7 @@ bundle(word_consumingdriver SOURCES
include_directories(${PROJECT_SOURCE_DIR}/device_access/device_access/public/include)
include_directories(${PROJECT_SOURCE_DIR}/device_access/example/refining_driver/public/include)
include_directories(private/include)
-include_directories("${PROJECT_SOURCE_DIR}/framework/include")
+include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
target_link_libraries(word_consumingdriver celix_utils celix_framework ${APR_LIBRARY})
Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * consuming_driver_private.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef CONSUMING_DRIVER_PRIVATE_H_
#define CONSUMING_DRIVER_PRIVATE_H_
Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
#include <apr_pools.h>
Modified: incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * consuming_driver.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
#include <apr_pools.h>
Modified: incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * refining_driver_private.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef REFINING_DRIVER_PRIVATE_H_
#define REFINING_DRIVER_PRIVATE_H_
Modified: incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
#include <apr_pools.h>
Modified: incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * refining_driver.c
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <apr_strings.h>
#include <apr_pools.h>
Modified: incubator/celix/trunk/device_access/example/refining_driver/public/include/refining_driver_device.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/public/include/refining_driver_device.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/public/include/refining_driver_device.h (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/public/include/refining_driver_device.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * refining_driver_device.h
+ *
+ * \date Jun 20, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef REFINING_DRIVER_DEVICE_H_
#define REFINING_DRIVER_DEVICE_H_
Modified: incubator/celix/trunk/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -19,13 +19,8 @@ if (EXAMPLES)
add_subdirectory(hello_world)
add_subdirectory(mongoose)
- #add_subdirectory(receiver)
- #add_subdirectory(receiver-2.0)
- #add_subdirectory(sender)
-
add_subdirectory(whiteboard)
add_subdirectory(echo_service)
- #add_subdirectory(component_testing)
add_subdirectory(osgi-in-action/chapter04-correct-lookup)
add_subdirectory(osgi-in-action/chapter04-correct-listener)
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=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -1,5 +1,25 @@
-bundle(echo_client SOURCES echo_client_activator echo_client)
-include_directories("${PROJECT_SOURCE_DIR}/celix")
+# 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.
+
+bundle(echo_client SOURCES
+ private/src/echo_client_activator
+ private/src/echo_client)
+include_directories("private/include")
+include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("../server")
+include_directories("../server/public/include")
target_link_libraries(echo_client celix_framework)
Copied: incubator/celix/trunk/examples/echo_service/client/private/include/echo_client_private.h (from r1370761, incubator/celix/trunk/examples/echo_service/client/echo_client_private.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/private/include/echo_client_private.h?p2=incubator/celix/trunk/examples/echo_service/client/private/include/echo_client_private.h&p1=incubator/celix/trunk/examples/echo_service/client/echo_client_private.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/echo_client_private.h (original)
+++ incubator/celix/trunk/examples/echo_service/client/private/include/echo_client_private.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_client_private.h
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef ECHO_CLIENT_PRIVATE_H_
Copied: incubator/celix/trunk/examples/echo_service/client/private/src/echo_client.c (from r1370761, incubator/celix/trunk/examples/echo_service/client/echo_client.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/private/src/echo_client.c?p2=incubator/celix/trunk/examples/echo_service/client/private/src/echo_client.c&p1=incubator/celix/trunk/examples/echo_service/client/echo_client.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/echo_client.c (original)
+++ incubator/celix/trunk/examples/echo_service/client/private/src/echo_client.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_client.c
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
#include <unistd.h>
Copied: incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c (from r1370761, incubator/celix/trunk/examples/echo_service/client/echo_client_activator.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c?p2=incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c&p1=incubator/celix/trunk/examples/echo_service/client/echo_client_activator.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/echo_client_activator.c (original)
+++ incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_server_activator.c
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
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=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -1,4 +1,24 @@
-bundle(echo_server SOURCES echo_server_activator echo_server)
-include_directories("${PROJECT_SOURCE_DIR}/celix")
+# 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.
+
+bundle(echo_server SOURCES
+ private/src/echo_server_activator
+ private/src/echo_server)
+include_directories("private/include")
+include_directories("public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
target_link_libraries(echo_server celix_framework)
Copied: incubator/celix/trunk/examples/echo_service/server/private/include/echo_server_private.h (from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server_private.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/private/include/echo_server_private.h?p2=incubator/celix/trunk/examples/echo_service/server/private/include/echo_server_private.h&p1=incubator/celix/trunk/examples/echo_service/server/echo_server_private.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/echo_server_private.h (original)
+++ incubator/celix/trunk/examples/echo_service/server/private/include/echo_server_private.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_server_private.h
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef ECHO_SERVER_PRIVATE_H_
Copied: incubator/celix/trunk/examples/echo_service/server/private/src/echo_server.c (from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/private/src/echo_server.c?p2=incubator/celix/trunk/examples/echo_service/server/private/src/echo_server.c&p1=incubator/celix/trunk/examples/echo_service/server/echo_server.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/echo_server.c (original)
+++ incubator/celix/trunk/examples/echo_service/server/private/src/echo_server.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_server.c
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
#include <stdio.h>
Copied: incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c (from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server_activator.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c?p2=incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c&p1=incubator/celix/trunk/examples/echo_service/server/echo_server_activator.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/echo_server_activator.c (original)
+++ incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_server_activator.c
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
Copied: incubator/celix/trunk/examples/echo_service/server/public/include/echo_server.h (from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/public/include/echo_server.h?p2=incubator/celix/trunk/examples/echo_service/server/public/include/echo_server.h&p1=incubator/celix/trunk/examples/echo_service/server/echo_server.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/echo_server.h (original)
+++ incubator/celix/trunk/examples/echo_service/server/public/include/echo_server.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* echo_server.h
*
- * Created on: Sep 21, 2010
- * Author: alexanderb
+ * \date Sep 21, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef ECHO_SERVER_H_
Modified: incubator/celix/trunk/examples/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/hello_world/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-bundle(hello_world SOURCES activator)
+bundle(hello_world SOURCES private/src/activator)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
target_link_libraries(hello_world celix_framework)
Modified: incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF (original)
+++ incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF Thu Aug 9 21:06:58 2012
@@ -2,23 +2,3 @@ Manifest-Version: 1.0
Bundle-SymbolicName: hello_world
Bundle-Version: 1.0.0
library: hello_world
-Import-Service: o2_alarm_service,
- o2_communication_service,
- o2_configuration_service,
- o2_control_service,
- o2_health_service,
- o2_latency_service,
- o2_logging_service,
- o2_notification_service,
- o2_recording_service,
- o2_parameter_service
-Export-Service: o2_alarm_service,
- o2_communication_service,
- o2_configuration_service,
- o2_control_service,
- o2_health_service,
- o2_latency_service,
- o2_logging_service,
- o2_notification_service,
- o2_recording_service,
- o2_parameter_service
Copied: incubator/celix/trunk/examples/hello_world/private/src/activator.c (from r1370761, incubator/celix/trunk/examples/hello_world/activator.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/private/src/activator.c?p2=incubator/celix/trunk/examples/hello_world/private/src/activator.c&p1=incubator/celix/trunk/examples/hello_world/activator.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/activator.c (original)
+++ incubator/celix/trunk/examples/hello_world/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* activator.c
*
- * Created on: Aug 20, 2010
- * Author: alexanderb
+ * \date Aug 20, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
#include <stdio.h>
Modified: incubator/celix/trunk/examples/mongoose/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/mongoose/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -15,11 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-add_library(mongoose STATIC mongoose.c)
+add_library(mongoose STATIC private/src/mongoose.c)
SET_TARGET_PROPERTIES(mongoose PROPERTIES COMPILE_FLAGS -fPIC)
+include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-bundle(celix.mongoose SOURCES activator DIRECTORIES root)
+bundle(celix.mongoose SOURCES private/src/activator DIRECTORIES root)
target_link_libraries(celix.mongoose celix_framework mongoose)
Copied: incubator/celix/trunk/examples/mongoose/private/include/mongoose.h (from r1370761, incubator/celix/trunk/examples/mongoose/mongoose.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/private/include/mongoose.h?p2=incubator/celix/trunk/examples/mongoose/private/include/mongoose.h&p1=incubator/celix/trunk/examples/mongoose/mongoose.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
(empty)
Copied: incubator/celix/trunk/examples/mongoose/private/src/activator.c (from r1370761, incubator/celix/trunk/examples/mongoose/activator.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/private/src/activator.c?p2=incubator/celix/trunk/examples/mongoose/private/src/activator.c&p1=incubator/celix/trunk/examples/mongoose/activator.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/activator.c (original)
+++ incubator/celix/trunk/examples/mongoose/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* activator.c
*
- * Created on: Aug 20, 2010
- * Author: alexanderb
+ * \date Aug 20, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
#include <stdio.h>
Copied: incubator/celix/trunk/examples/mongoose/private/src/mongoose.c (from r1370761, incubator/celix/trunk/examples/mongoose/mongoose.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/private/src/mongoose.c?p2=incubator/celix/trunk/examples/mongoose/private/src/mongoose.c&p1=incubator/celix/trunk/examples/mongoose/mongoose.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
(empty)
Modified: incubator/celix/trunk/examples/mongoose/root/index.html
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/root/index.html?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/root/index.html (original)
+++ incubator/celix/trunk/examples/mongoose/root/index.html Thu Aug 9 21:06:58 2012
@@ -1,3 +1,21 @@
+<!--
+ *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.
+-->
<div align="center"><FONT
color="#ffffff" size="+1"><MARQUEE bgcolor="#000080"
direction="right" loop="20" width="75%"><STRONG>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/README.TXT
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/README.TXT?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/README.TXT (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/README.TXT Thu Aug 9 21:06:58 2012
@@ -1,3 +1,20 @@
+# 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.
+
The example activates the bundles `chapter01-greeting-example` and `chapter01-greeting-example-client`.
The activator of the client bundle (client.c) tries to find the greeting service, but may fail at start-up,
because it is activated before the greeting service is installed.
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * client.c
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <stdio.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/include/greeting_impl.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/include/greeting_impl.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/include/greeting_impl.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/include/greeting_impl.h Thu Aug 9 21:06:58 2012
@@ -16,6 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
+/*
+ * greeting_impl.h
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef GREETING_IMPL_H_
#define GREETING_IMPL_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <stdio.h>
#include <apr_general.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/greeting_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/greeting_impl.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/greeting_impl.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/greeting_impl.c Thu Aug 9 21:06:58 2012
@@ -16,6 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
+/*
+ * greeting_impl.c
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdio.h>
#include "greeting_impl.h"
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/public/include/greeting_service.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/public/include/greeting_service.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/public/include/greeting_service.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/public/include/greeting_service.h Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * greeting_service.h
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#ifndef GREETING_H_
#define GREETING_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/README.TXT
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/README.TXT?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/README.TXT (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/README.TXT Thu Aug 9 21:06:58 2012
@@ -1,3 +1,20 @@
+# 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.
+
In the log server a listener registers when the log_service bundle is stopped and
started by means of the serviceChanged() routine. This routine maintains the set of log
services in the variable m_logServiceRefs. The function getLogService() returns the
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c Thu Aug 9 21:06:58 2012
@@ -1,8 +1,27 @@
+/**
+ *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.
+ */
/*
* listener_example.c
*
- * Created on: Sep 22, 2011
- * Author: alexander
+ * \date Sep 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#include <stdlib.h>
#include <stdio.h>
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=1371483&r1=1371482&r2=1371483&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 Thu Aug 9 21:06:58 2012
@@ -16,6 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
+/*
+ * listener_example.c
+ *
+ * \date Sep 29, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <stdio.h>
#include <apr_general.h>
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=1371483&r1=1371482&r2=1371483&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 Aug 9 21:06:58 2012
@@ -14,14 +14,14 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
INCLUDE(FindPkgConfig)
pkg_search_module (GLIB REQUIRED glib-2.0)
pkg_search_module (GTHR REQUIRED gthread-2.0)
pkg_search_module (GTK REQUIRED gtk+-2.0)
include_directories(
private/include
- public/include
- ../simple//public/include
+ ../simple/public/include
)
include_directories(${GTK_INCLUDE_DIRS})
include_directories(${GLIB_INCLUDE_DIRS})
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h Thu Aug 9 21:06:58 2012
@@ -1,9 +1,28 @@
+/**
+ *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.
+ */
/*
* default_shape.h
*
- * Created on: Aug 22, 2011
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
#ifndef CIRCLE_SHAPE_H_
#define CIRCLE_SHAPE_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <stdio.h>
#include <apr_general.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c Thu Aug 9 21:06:58 2012
@@ -1,11 +1,28 @@
+/**
+ *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.
+ */
/*
* simple_shape.c
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
-
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
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=1371483&r1=1371482&r2=1371483&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 Aug 9 21:06:58 2012
@@ -14,17 +14,14 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
INCLUDE(FindPkgConfig)
pkg_search_module (GLIB REQUIRED glib-2.0)
pkg_search_module (GTHR REQUIRED gthread-2.0)
pkg_search_module (GTK REQUIRED gtk+-2.0)
pkg_search_module (GMODULE REQUIRED gmodule-2.0)
include_directories(
- ../circle/public/include
- ../square/public/include
- ../triangle/public/include
private/include
- public/include
../simple/public/include
)
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/gtktest.glade
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/gtktest.glade?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/gtktest.glade (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/gtktest.glade Thu Aug 9 21:06:58 2012
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *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.
+-->
<interface>
<requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy project-wide -->
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h Thu Aug 9 21:06:58 2012
@@ -1,10 +1,28 @@
+/**
+ *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.
+ */
/*
* default_shape.h
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
#ifndef DEFAULT_SHAPE_H_
#define DEFAULT_SHAPE_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h Thu Aug 9 21:06:58 2012
@@ -1,8 +1,27 @@
+/**
+ *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.
+ */
/*
* paint_frame.h
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef PAINT_FRAME_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/shape_component.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/shape_component.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/shape_component.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/shape_component.h Thu Aug 9 21:06:58 2012
@@ -1,8 +1,27 @@
+/**
+ *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.
+ */
/*
* shape_component.h
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef SHAPE_COMPONENT_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <stdio.h>
#include <apr_general.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c Thu Aug 9 21:06:58 2012
@@ -1,8 +1,27 @@
+/**
+ *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.
+ */
/*
* simple_shape.c
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c Thu Aug 9 21:06:58 2012
@@ -1,18 +1,37 @@
+/**
+ *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.
+ */
/*
* paint_frame.c
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-/**
+/*
* This class represents the main application class, which is a JFrame subclass
* that manages a toolbar of shapes and a drawing canvas. This class does not
* directly interact with the underlying OSGi framework; instead, it is injected
* with the available <tt>SimpleShape</tt> instances to eliminate any
* dependencies on the OSGi application programming interfaces.
- **/
+ */
#include <stdio.h>
#include <stdlib.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c Thu Aug 9 21:06:58 2012
@@ -1,10 +1,28 @@
+/**
+ *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.
+ */
/*
* shape_component.c
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
#include <stdio.h>
#include <stdio.h>
#include <string.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/simple/public/include/simple_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/simple/public/include/simple_shape.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/simple/public/include/simple_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/simple/public/include/simple_shape.h Thu Aug 9 21:06:58 2012
@@ -1,10 +1,28 @@
+/**
+ *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.
+ */
/*
* simple_shape.h
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
#ifndef SIMPLE_SHAPE_H_
#define SIMPLE_SHAPE_H_
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=1371483&r1=1371482&r2=1371483&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 Aug 9 21:06:58 2012
@@ -14,13 +14,13 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
INCLUDE(FindPkgConfig)
pkg_search_module (GLIB REQUIRED glib-2.0)
pkg_search_module (GTHR REQUIRED gthread-2.0)
pkg_search_module (GTK REQUIRED gtk+-2.0)
include_directories(
private/include
- public/include
../simple/public/include
)
include_directories(${GTK_INCLUDE_DIRS})
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h Thu Aug 9 21:06:58 2012
@@ -1,10 +1,28 @@
+/**
+ *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.
+ */
/*
* default_shape.h
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
#ifndef SQUARE_SHAPE_H_
#define SQUARE_SHAPE_H_
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c Thu Aug 9 21:06:58 2012
@@ -16,7 +16,13 @@
*specific language governing permissions and limitations
*under the License.
*/
-
+/*
+ * activator.c
+ *
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
+ */
#include <stdlib.h>
#include <stdio.h>
#include <apr_general.h>
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c Thu Aug 9 21:06:58 2012
@@ -1,11 +1,28 @@
+/**
+ *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.
+ */
/*
* simple_shape.c
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
-
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
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=1371483&r1=1371482&r2=1371483&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 Aug 9 21:06:58 2012
@@ -14,13 +14,13 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
INCLUDE(FindPkgConfig)
pkg_search_module (GLIB REQUIRED glib-2.0)
pkg_search_module (GTHR REQUIRED gthread-2.0)
pkg_search_module (GTK REQUIRED gtk+-2.0)
include_directories(
private/include
- public/include
../simple/public/include
)
include_directories(${GTK_INCLUDE_DIRS})
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h Thu Aug 9 21:06:58 2012
@@ -1,8 +1,27 @@
+/**
+ *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.
+ */
/*
* default_shape.h
*
- * Created on: Aug 22, 2011
- * Author: operator
+ * \date Aug 22, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef TRIANGLE_SHAPE_H_