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 [1/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_...
Author: abroekhuis
Date: Thu Aug 9 21:06:58 2012
New Revision: 1371483
URL: http://svn.apache.org/viewvc?rev=1371483&view=rev
Log:
Updated the license and file headers and updated to correct directory structure.
Added:
incubator/celix/trunk/cmake/NOTE
- copied, changed from r1370761, incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt
incubator/celix/trunk/cmake/RunConfig.in
- copied, changed from r1370761, incubator/celix/trunk/Echo.launch
incubator/celix/trunk/dependency_manager/private/
incubator/celix/trunk/dependency_manager/private/src/
incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/dependency_activator_base.c
incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/dependency_manager.c
incubator/celix/trunk/dependency_manager/private/src/service_component.c
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/service_component.c
incubator/celix/trunk/dependency_manager/private/src/service_dependency.c
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/service_dependency.c
incubator/celix/trunk/dependency_manager/public/
incubator/celix/trunk/dependency_manager/public/include/
incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/dependency_activator_base.h
incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/dependency_manager.h
incubator/celix/trunk/dependency_manager/public/include/service.h
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/service.h
incubator/celix/trunk/dependency_manager/public/include/service_component.h
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/service_component.h
incubator/celix/trunk/dependency_manager/public/include/service_component_private.h
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/service_component_private.h
incubator/celix/trunk/dependency_manager/public/include/service_dependency.h
- copied, changed from r1370761, incubator/celix/trunk/dependency_manager/service_dependency.h
incubator/celix/trunk/examples/echo_service/client/private/
incubator/celix/trunk/examples/echo_service/client/private/include/
incubator/celix/trunk/examples/echo_service/client/private/include/echo_client_private.h
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/client/echo_client_private.h
incubator/celix/trunk/examples/echo_service/client/private/src/
incubator/celix/trunk/examples/echo_service/client/private/src/echo_client.c
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/client/echo_client.c
incubator/celix/trunk/examples/echo_service/client/private/src/echo_client_activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/client/echo_client_activator.c
incubator/celix/trunk/examples/echo_service/server/private/
incubator/celix/trunk/examples/echo_service/server/private/include/
incubator/celix/trunk/examples/echo_service/server/private/include/echo_server_private.h
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server_private.h
incubator/celix/trunk/examples/echo_service/server/private/src/
incubator/celix/trunk/examples/echo_service/server/private/src/echo_server.c
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server.c
incubator/celix/trunk/examples/echo_service/server/private/src/echo_server_activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server_activator.c
incubator/celix/trunk/examples/echo_service/server/public/
incubator/celix/trunk/examples/echo_service/server/public/include/
incubator/celix/trunk/examples/echo_service/server/public/include/echo_server.h
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server.h
incubator/celix/trunk/examples/hello_world/private/
incubator/celix/trunk/examples/hello_world/private/src/
incubator/celix/trunk/examples/hello_world/private/src/activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/hello_world/activator.c
incubator/celix/trunk/examples/mongoose/private/
incubator/celix/trunk/examples/mongoose/private/include/
incubator/celix/trunk/examples/mongoose/private/include/mongoose.h
- copied, changed from r1370761, incubator/celix/trunk/examples/mongoose/mongoose.h
incubator/celix/trunk/examples/mongoose/private/src/
incubator/celix/trunk/examples/mongoose/private/src/activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/mongoose/activator.c
incubator/celix/trunk/examples/mongoose/private/src/mongoose.c
- copied, changed from r1370761, incubator/celix/trunk/examples/mongoose/mongoose.c
incubator/celix/trunk/examples/whiteboard/publisherA/private/
incubator/celix/trunk/examples/whiteboard/publisherA/private/src/
incubator/celix/trunk/examples/whiteboard/publisherA/private/src/activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/publisherA/activator.c
incubator/celix/trunk/examples/whiteboard/publisherA/private/src/publisher.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/publisherA/publisher.c
incubator/celix/trunk/examples/whiteboard/publisherB/private/
incubator/celix/trunk/examples/whiteboard/publisherB/private/src/
incubator/celix/trunk/examples/whiteboard/publisherB/private/src/activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/publisherB/activator.c
incubator/celix/trunk/examples/whiteboard/publisherB/private/src/publisher.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/publisherB/publisher.c
incubator/celix/trunk/examples/whiteboard/publisherService/private/
incubator/celix/trunk/examples/whiteboard/publisherService/private/include/
incubator/celix/trunk/examples/whiteboard/publisherService/private/include/publisher_private.h
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/publisherService/publisher_private.h
incubator/celix/trunk/examples/whiteboard/publisherService/public/
incubator/celix/trunk/examples/whiteboard/publisherService/public/include/
incubator/celix/trunk/examples/whiteboard/publisherService/public/include/publisher.h
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/publisherService/publisher.h
incubator/celix/trunk/examples/whiteboard/tracker/private/
incubator/celix/trunk/examples/whiteboard/tracker/private/src/
incubator/celix/trunk/examples/whiteboard/tracker/private/src/activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/tracker/activator.c
incubator/celix/trunk/examples/whiteboard/tracker_depman/private/
incubator/celix/trunk/examples/whiteboard/tracker_depman/private/include/
incubator/celix/trunk/examples/whiteboard/tracker_depman/private/include/tracker.h
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/tracker_depman/tracker.h
incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/
incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/dependency_activator.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/tracker_depman/dependency_activator.c
incubator/celix/trunk/examples/whiteboard/tracker_depman/private/src/tracker.c
- copied, changed from r1370761, incubator/celix/trunk/examples/whiteboard/tracker_depman/tracker.c
incubator/celix/trunk/launcher/private/
incubator/celix/trunk/launcher/private/src/
incubator/celix/trunk/launcher/private/src/launcher.c
- copied, changed from r1370761, incubator/celix/trunk/launcher/launcher.c
incubator/celix/trunk/log_writer/private/
incubator/celix/trunk/log_writer/private/include/
incubator/celix/trunk/log_writer/private/include/log_writer.h
- copied, changed from r1370761, incubator/celix/trunk/log_writer/log_writer.h
incubator/celix/trunk/log_writer/private/src/
incubator/celix/trunk/log_writer/private/src/dependency_activator.c
- copied, changed from r1370761, incubator/celix/trunk/log_writer/dependency_activator.c
incubator/celix/trunk/log_writer/private/src/log_writer.c
- copied, changed from r1370761, incubator/celix/trunk/log_writer/log_writer.c
incubator/celix/trunk/shell/private/
incubator/celix/trunk/shell/private/include/
incubator/celix/trunk/shell/private/include/inspect_command.h
- copied, changed from r1370761, incubator/celix/trunk/examples/echo_service/server/echo_server.h
incubator/celix/trunk/shell/private/include/install_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/install_command.h
incubator/celix/trunk/shell/private/include/log_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/log_command.h
incubator/celix/trunk/shell/private/include/ps_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/ps_command.h
incubator/celix/trunk/shell/private/include/shell_private.h
- copied, changed from r1370761, incubator/celix/trunk/shell/shell_private.h
incubator/celix/trunk/shell/private/include/start_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/start_command.h
incubator/celix/trunk/shell/private/include/stop_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/stop_command.h
incubator/celix/trunk/shell/private/include/uninstall_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/uninstall_command.h
incubator/celix/trunk/shell/private/include/update_command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/update_command.h
incubator/celix/trunk/shell/private/src/
incubator/celix/trunk/shell/private/src/command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/command.c
incubator/celix/trunk/shell/private/src/inspect_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/inspect_command.c
incubator/celix/trunk/shell/private/src/install_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/install_command.c
incubator/celix/trunk/shell/private/src/log_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/log_command.c
incubator/celix/trunk/shell/private/src/ps_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/ps_command.c
incubator/celix/trunk/shell/private/src/shell.c
- copied, changed from r1370761, incubator/celix/trunk/shell/shell.c
incubator/celix/trunk/shell/private/src/start_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/start_command.c
incubator/celix/trunk/shell/private/src/stop_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/stop_command.c
incubator/celix/trunk/shell/private/src/uninstall_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/uninstall_command.c
incubator/celix/trunk/shell/private/src/update_command.c
- copied, changed from r1370761, incubator/celix/trunk/shell/update_command.c
incubator/celix/trunk/shell/public/
incubator/celix/trunk/shell/public/include/
incubator/celix/trunk/shell/public/include/command.h
- copied, changed from r1370761, incubator/celix/trunk/shell/command.h
incubator/celix/trunk/shell/public/include/command_private.h
- copied, changed from r1370761, incubator/celix/trunk/shell/command_private.h
incubator/celix/trunk/shell/public/include/shell.h
- copied, changed from r1370761, incubator/celix/trunk/shell/shell.h
incubator/celix/trunk/shell_tui/private/
incubator/celix/trunk/shell_tui/private/src/
incubator/celix/trunk/shell_tui/private/src/shell_tui.c
- copied, changed from r1370761, incubator/celix/trunk/shell_tui/shell_tui.c
Removed:
incubator/celix/trunk/.cproject
incubator/celix/trunk/.project
incubator/celix/trunk/Deployment Admin.launch
incubator/celix/trunk/Echo.launch
incubator/celix/trunk/Hello World.launch
incubator/celix/trunk/Hello world Massif.launch
incubator/celix/trunk/Log Listener.launch
incubator/celix/trunk/Paint Example.launch
incubator/celix/trunk/Remote Services Client.launch
incubator/celix/trunk/Remote Services.launch
incubator/celix/trunk/WB Dependency Manager.launch
incubator/celix/trunk/WB Service tracker.launch
incubator/celix/trunk/celix Default.launch
incubator/celix/trunk/cmake/modules/COPYING-CMAKE-SCRIPTS
incubator/celix/trunk/dependency_manager/dependency_activator_base.c
incubator/celix/trunk/dependency_manager/dependency_activator_base.h
incubator/celix/trunk/dependency_manager/dependency_manager.c
incubator/celix/trunk/dependency_manager/dependency_manager.h
incubator/celix/trunk/dependency_manager/service.h
incubator/celix/trunk/dependency_manager/service_component.c
incubator/celix/trunk/dependency_manager/service_component.h
incubator/celix/trunk/dependency_manager/service_component_private.h
incubator/celix/trunk/dependency_manager/service_dependency.c
incubator/celix/trunk/dependency_manager/service_dependency.h
incubator/celix/trunk/examples/echo_service/client/echo_client.c
incubator/celix/trunk/examples/echo_service/client/echo_client_activator.c
incubator/celix/trunk/examples/echo_service/client/echo_client_private.h
incubator/celix/trunk/examples/echo_service/server/echo_server.c
incubator/celix/trunk/examples/echo_service/server/echo_server.h
incubator/celix/trunk/examples/echo_service/server/echo_server_activator.c
incubator/celix/trunk/examples/echo_service/server/echo_server_private.h
incubator/celix/trunk/examples/hello_world/activator.c
incubator/celix/trunk/examples/mongoose/activator.c
incubator/celix/trunk/examples/mongoose/mongoose.c
incubator/celix/trunk/examples/mongoose/mongoose.h
incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt
incubator/celix/trunk/examples/receiver-2.0/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/receiver-2.0/activator.c
incubator/celix/trunk/examples/receiver-2.0/serviceTest.c
incubator/celix/trunk/examples/receiver-2.0/serviceTest.h
incubator/celix/trunk/examples/receiver-2.0/serviceTest_private.h
incubator/celix/trunk/examples/receiver/CMakeLists.txt
incubator/celix/trunk/examples/receiver/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/receiver/activator.c
incubator/celix/trunk/examples/receiver/serviceTest.c
incubator/celix/trunk/examples/receiver/serviceTest.h
incubator/celix/trunk/examples/receiver/serviceTest_private.h
incubator/celix/trunk/examples/sender/CMakeLists.txt
incubator/celix/trunk/examples/sender/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/sender/listenerTest.c
incubator/celix/trunk/examples/sender/listenerTest.h
incubator/celix/trunk/examples/sender/test_activator.c
incubator/celix/trunk/examples/whiteboard/publisherA/activator.c
incubator/celix/trunk/examples/whiteboard/publisherA/publisher.c
incubator/celix/trunk/examples/whiteboard/publisherB/activator.c
incubator/celix/trunk/examples/whiteboard/publisherB/publisher.c
incubator/celix/trunk/examples/whiteboard/publisherService/publisher.h
incubator/celix/trunk/examples/whiteboard/publisherService/publisher_private.h
incubator/celix/trunk/examples/whiteboard/tracker/activator.c
incubator/celix/trunk/examples/whiteboard/tracker_depman/dependency_activator.c
incubator/celix/trunk/examples/whiteboard/tracker_depman/tracker.c
incubator/celix/trunk/examples/whiteboard/tracker_depman/tracker.h
incubator/celix/trunk/launcher/launcher.c
incubator/celix/trunk/log_writer/dependency_activator.c
incubator/celix/trunk/log_writer/log_writer.c
incubator/celix/trunk/log_writer/log_writer.h
incubator/celix/trunk/shell/command.c
incubator/celix/trunk/shell/command.h
incubator/celix/trunk/shell/command_private.h
incubator/celix/trunk/shell/inspect_command.c
incubator/celix/trunk/shell/inspect_command.h
incubator/celix/trunk/shell/install_command.c
incubator/celix/trunk/shell/install_command.h
incubator/celix/trunk/shell/log_command.c
incubator/celix/trunk/shell/log_command.h
incubator/celix/trunk/shell/ps_command.c
incubator/celix/trunk/shell/ps_command.h
incubator/celix/trunk/shell/shell.c
incubator/celix/trunk/shell/shell.h
incubator/celix/trunk/shell/shell_private.h
incubator/celix/trunk/shell/start_command.c
incubator/celix/trunk/shell/start_command.h
incubator/celix/trunk/shell/stop_command.c
incubator/celix/trunk/shell/stop_command.h
incubator/celix/trunk/shell/uninstall_command.c
incubator/celix/trunk/shell/uninstall_command.h
incubator/celix/trunk/shell/update_command.c
incubator/celix/trunk/shell/update_command.h
incubator/celix/trunk/shell_tui/shell_tui.c
Modified:
incubator/celix/trunk/.gitignore
incubator/celix/trunk/LICENSE.txt
incubator/celix/trunk/cmake/Dependencies.cmake
incubator/celix/trunk/cmake/Packaging.cmake
incubator/celix/trunk/cmake/modules/FindAPR.cmake
incubator/celix/trunk/cmake/modules/UseDoxygen.cmake
incubator/celix/trunk/dependency_manager/CMakeLists.txt
incubator/celix/trunk/deployment_admin/CMakeLists.txt
incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h
incubator/celix/trunk/deployment_admin/private/include/deployment_package.h
incubator/celix/trunk/deployment_admin/private/include/log.h
incubator/celix/trunk/deployment_admin/private/include/log_event.h
incubator/celix/trunk/deployment_admin/private/include/log_store.h
incubator/celix/trunk/deployment_admin/private/include/log_sync.h
incubator/celix/trunk/deployment_admin/private/include/miniunz.h
incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c
incubator/celix/trunk/deployment_admin/private/src/deployment_package.c
incubator/celix/trunk/deployment_admin/private/src/log.c
incubator/celix/trunk/deployment_admin/private/src/log_store.c
incubator/celix/trunk/deployment_admin/private/src/log_sync.c
incubator/celix/trunk/deployment_admin/private/src/miniunz.c
incubator/celix/trunk/deployment_admin/public/include/resource_processor.h
incubator/celix/trunk/device_access/CMakeLists.txt
incubator/celix/trunk/device_access/device_access/CMakeLists.txt
incubator/celix/trunk/device_access/device_access/private/include/device_manager.h
incubator/celix/trunk/device_access/device_access/private/include/driver_attributes.h
incubator/celix/trunk/device_access/device_access/private/include/driver_loader.h
incubator/celix/trunk/device_access/device_access/private/include/driver_matcher.h
incubator/celix/trunk/device_access/device_access/private/src/activator.c
incubator/celix/trunk/device_access/device_access/private/src/device_manager.c
incubator/celix/trunk/device_access/device_access/private/src/driver_attributes.c
incubator/celix/trunk/device_access/device_access/private/src/driver_loader.c
incubator/celix/trunk/device_access/device_access/private/src/driver_matcher.c
incubator/celix/trunk/device_access/device_access/public/include/device.h
incubator/celix/trunk/device_access/device_access/public/include/driver.h
incubator/celix/trunk/device_access/device_access/public/include/driver_locator.h
incubator/celix/trunk/device_access/device_access/public/include/driver_selector.h
incubator/celix/trunk/device_access/device_access/public/include/match.h
incubator/celix/trunk/device_access/driver_locator/private/include/driver_locator_private.h
incubator/celix/trunk/device_access/driver_locator/private/src/activator.c
incubator/celix/trunk/device_access/driver_locator/private/src/driver_locator.c
incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
incubator/celix/trunk/device_access/example/base_driver/private/include/base_driver_private.h
incubator/celix/trunk/device_access/example/base_driver/private/src/activator.c
incubator/celix/trunk/device_access/example/base_driver/private/src/base_driver.c
incubator/celix/trunk/device_access/example/base_driver/public/include/base_driver_device.h
incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
incubator/celix/trunk/device_access/example/consuming_driver/private/include/consuming_driver_private.h
incubator/celix/trunk/device_access/example/consuming_driver/private/src/activator.c
incubator/celix/trunk/device_access/example/consuming_driver/private/src/consuming_driver.c
incubator/celix/trunk/device_access/example/refining_driver/private/include/refining_driver_private.h
incubator/celix/trunk/device_access/example/refining_driver/private/src/activator.c
incubator/celix/trunk/device_access/example/refining_driver/private/src/refining_driver.c
incubator/celix/trunk/device_access/example/refining_driver/public/include/refining_driver_device.h
incubator/celix/trunk/examples/CMakeLists.txt
incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
incubator/celix/trunk/examples/hello_world/CMakeLists.txt
incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/mongoose/CMakeLists.txt
incubator/celix/trunk/examples/mongoose/root/index.html
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/README.TXT
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/private/src/client.c
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/include/greeting_impl.h
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/activator.c
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/private/src/greeting_impl.c
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/public/include/greeting_service.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/README.TXT
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/private/src/listener_example.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/include/circle_shape.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/activator.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/private/src/circle_shape.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/gtktest.glade
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/default_shape.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/paint_frame.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/include/shape_component.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/activator.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/default_shape.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/paint_frame.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/private/src/shape_component.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/simple/public/include/simple_shape.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/include/square_shape.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/activator.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/private/src/square_shape.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/include/triangle_shape.h
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/activator.c
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/private/src/triangle_shape.c
incubator/celix/trunk/examples/whiteboard/publisherA/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/publisherB/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/tracker/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/framework/private/include/attribute.h
incubator/celix/trunk/framework/private/include/bundle_cache.h
incubator/celix/trunk/framework/private/include/bundle_private.h
incubator/celix/trunk/framework/private/include/framework_log.h
incubator/celix/trunk/framework/private/include/listener_hook_info_impl.h
incubator/celix/trunk/framework/private/include/manifest_parser.h
incubator/celix/trunk/framework/private/include/resolver.h
incubator/celix/trunk/framework/private/src/attribute.c
incubator/celix/trunk/framework/private/src/bundle.c
incubator/celix/trunk/framework/private/src/bundle_archive.c
incubator/celix/trunk/framework/private/src/bundle_cache.c
incubator/celix/trunk/framework/private/src/bundle_context.c
incubator/celix/trunk/framework/private/src/bundle_revision.c
incubator/celix/trunk/framework/private/src/capability.c
incubator/celix/trunk/framework/private/src/celix_errorcodes.c
incubator/celix/trunk/framework/private/src/filter.c
incubator/celix/trunk/framework/private/src/framework.c
incubator/celix/trunk/framework/private/src/manifest.c
incubator/celix/trunk/framework/private/src/manifest_parser.c
incubator/celix/trunk/framework/private/src/module.c
incubator/celix/trunk/framework/private/src/properties.c
incubator/celix/trunk/framework/private/src/requirement.c
incubator/celix/trunk/framework/private/src/resolver.c
incubator/celix/trunk/framework/private/src/service_reference.c
incubator/celix/trunk/framework/private/src/service_registration.c
incubator/celix/trunk/framework/private/src/service_registry.c
incubator/celix/trunk/framework/private/src/service_tracker.c
incubator/celix/trunk/framework/private/src/utils.c
incubator/celix/trunk/framework/private/src/version.c
incubator/celix/trunk/framework/private/src/version_range.c
incubator/celix/trunk/framework/private/src/wire.c
incubator/celix/trunk/framework/private/test/framework_test.c
incubator/celix/trunk/framework/public/include/archive.h
incubator/celix/trunk/framework/public/include/bundle.h
incubator/celix/trunk/framework/public/include/bundle_activator.h
incubator/celix/trunk/framework/public/include/bundle_archive.h
incubator/celix/trunk/framework/public/include/bundle_context.h
incubator/celix/trunk/framework/public/include/bundle_event.h
incubator/celix/trunk/framework/public/include/bundle_listener.h
incubator/celix/trunk/framework/public/include/bundle_revision.h
incubator/celix/trunk/framework/public/include/bundle_state.h
incubator/celix/trunk/framework/public/include/capability.h
incubator/celix/trunk/framework/public/include/celix_errno.h
incubator/celix/trunk/framework/public/include/celix_log.h
incubator/celix/trunk/framework/public/include/celixbool.h
incubator/celix/trunk/framework/public/include/constants.h
incubator/celix/trunk/framework/public/include/filter.h
incubator/celix/trunk/framework/public/include/framework.h
incubator/celix/trunk/framework/public/include/listener_hook_service.h
incubator/celix/trunk/framework/public/include/manifest.h
incubator/celix/trunk/framework/public/include/module.h
incubator/celix/trunk/framework/public/include/properties.h
incubator/celix/trunk/framework/public/include/requirement.h
incubator/celix/trunk/framework/public/include/service_event.h
incubator/celix/trunk/framework/public/include/service_factory.h
incubator/celix/trunk/framework/public/include/service_listener.h
incubator/celix/trunk/framework/public/include/service_reference.h
incubator/celix/trunk/framework/public/include/service_registration.h
incubator/celix/trunk/framework/public/include/service_registry.h
incubator/celix/trunk/framework/public/include/service_tracker.h
incubator/celix/trunk/framework/public/include/utils.h
incubator/celix/trunk/framework/public/include/version.h
incubator/celix/trunk/framework/public/include/version_range.h
incubator/celix/trunk/framework/public/include/wire.h
incubator/celix/trunk/hessian/source/CMakeLists.txt
incubator/celix/trunk/hessian/source/private/src/hessian_in.c
incubator/celix/trunk/hessian/source/private/src/hessian_out.c
incubator/celix/trunk/hessian/source/private/test/test_hessian_out.c
incubator/celix/trunk/hessian/source/private/test/test_service.h
incubator/celix/trunk/hessian/source/private/test/test_service_proxy.c
incubator/celix/trunk/hessian/source/private/test/test_service_skeleton.c
incubator/celix/trunk/hessian/source/public/include/hessian_2.0.h
incubator/celix/trunk/hessian/source/public/include/hessian_2.0_in.h
incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
incubator/celix/trunk/hessian/source/public/include/hessian_constants.h
incubator/celix/trunk/hessian/source/test.c
incubator/celix/trunk/launcher/CMakeLists.txt
incubator/celix/trunk/log_service/CMakeLists.txt
incubator/celix/trunk/log_service/private/include/log.h
incubator/celix/trunk/log_service/private/include/log_factory.h
incubator/celix/trunk/log_service/private/include/log_reader_service_impl.h
incubator/celix/trunk/log_service/private/include/log_service_impl.h
incubator/celix/trunk/log_service/private/src/log.c
incubator/celix/trunk/log_service/private/src/log_entry.c
incubator/celix/trunk/log_service/private/src/log_factory.c
incubator/celix/trunk/log_service/private/src/log_reader_service_impl.c
incubator/celix/trunk/log_service/private/src/log_service_activator.c
incubator/celix/trunk/log_service/private/src/log_service_impl.c
incubator/celix/trunk/log_service/public/include/log_entry.h
incubator/celix/trunk/log_service/public/include/log_listener.h
incubator/celix/trunk/log_service/public/include/log_reader_service.h
incubator/celix/trunk/log_service/public/include/log_service.h
incubator/celix/trunk/log_writer/CMakeLists.txt
incubator/celix/trunk/remote_services/CMakeLists.txt
incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
incubator/celix/trunk/remote_services/calc_shell/private/include/add_command.h
incubator/celix/trunk/remote_services/calc_shell/private/include/sqrt_command.h
incubator/celix/trunk/remote_services/calc_shell/private/include/sub_command.h
incubator/celix/trunk/remote_services/calc_shell/private/src/add_command.c
incubator/celix/trunk/remote_services/calc_shell/private/src/calc_shell_activator.c
incubator/celix/trunk/remote_services/calc_shell/private/src/sqrt_command.c
incubator/celix/trunk/remote_services/calc_shell/private/src/sub_command.c
incubator/celix/trunk/remote_services/discovery/private/include/discovery.h
incubator/celix/trunk/remote_services/discovery/private/src/discovery.c
incubator/celix/trunk/remote_services/discovery/private/src/discovery_activator.c
incubator/celix/trunk/remote_services/endpoint_listener/public/include/endpoint_listener.h
incubator/celix/trunk/remote_services/example_endpoint/private/include/example_endpoint_impl.h
incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_activator.c
incubator/celix/trunk/remote_services/example_endpoint/private/src/example_endpoint_impl.c
incubator/celix/trunk/remote_services/example_proxy/private/include/example_proxy_impl.h
incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_activator.c
incubator/celix/trunk/remote_services/example_proxy/private/src/example_proxy_impl.c
incubator/celix/trunk/remote_services/example_service/private/include/example_impl.h
incubator/celix/trunk/remote_services/example_service/private/src/example_activator.c
incubator/celix/trunk/remote_services/example_service/private/src/example_impl.c
incubator/celix/trunk/remote_services/example_service/public/include/example_service.h
incubator/celix/trunk/remote_services/remote_service_admin/private/include/export_registration_impl.h
incubator/celix/trunk/remote_services/remote_service_admin/private/include/import_registration_impl.h
incubator/celix/trunk/remote_services/remote_service_admin/private/include/remote_service_admin_impl.h
incubator/celix/trunk/remote_services/remote_service_admin/private/src/export_registration_impl.c
incubator/celix/trunk/remote_services/remote_service_admin/private/src/import_registration_impl.c
incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_activator.c
incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h
incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h
incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h
incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h
incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c
incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h
incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c
incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c
incubator/celix/trunk/remote_services/utils/public/include/remote_constants.h
incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h
incubator/celix/trunk/shell/CMakeLists.txt
incubator/celix/trunk/shell_tui/CMakeLists.txt
incubator/celix/trunk/utils/CMakeLists.txt
incubator/celix/trunk/utils/private/include/array_list_private.h
incubator/celix/trunk/utils/private/include/hash_map_private.h
incubator/celix/trunk/utils/private/include/linked_list_private.h
incubator/celix/trunk/utils/private/src/array_list.c
incubator/celix/trunk/utils/private/src/hash_map.c
incubator/celix/trunk/utils/private/src/linked_list_iterator.c
incubator/celix/trunk/utils/private/src/linkedlist.c
incubator/celix/trunk/utils/private/test/array_list_test.c
incubator/celix/trunk/utils/private/test/hash_map_test.c
incubator/celix/trunk/utils/private/test/hash_map_test_hash.c
incubator/celix/trunk/utils/private/test/linked_list_test.c
incubator/celix/trunk/utils/public/include/array_list.h
incubator/celix/trunk/utils/public/include/exports.h
incubator/celix/trunk/utils/public/include/hash_map.h
incubator/celix/trunk/utils/public/include/linked_list_iterator.h
incubator/celix/trunk/utils/public/include/linkedlist.h
Modified: incubator/celix/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.gitignore?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/.gitignore (original)
+++ incubator/celix/trunk/.gitignore Thu Aug 9 21:06:58 2012
@@ -1 +1,4 @@
hessian/build/
+
+/.cproject
+/.project
\ No newline at end of file
Modified: incubator/celix/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/LICENSE.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/LICENSE.txt (original)
+++ incubator/celix/trunk/LICENSE.txt Thu Aug 9 21:06:58 2012
@@ -201,5 +201,80 @@
See the License for the specific language governing permissions and
limitations under the License.
+---------------------------------------------------------------------------------
-#TODO Additional licenses
+Minizip License (unzip.h/c and miniunz.h/c and ioapi.h/c)
+
+Condition of use and distribution are the same than zlib :
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+---------------------------------------------------------------------------------
+
+CMake Module for Doxygen (UseDoxygen.cmake)
+
+Redistribution and use is allowed according to the terms of the New
+BSD license:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---------------------------------------------------------------------------------
+
+Mongoose (mongoose.h/c)
+
+Copyright (c) 2004-2011 Sergey Lyubka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---------------------------------------------------------------------------------
\ No newline at end of file
Modified: incubator/celix/trunk/cmake/Dependencies.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Dependencies.cmake?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Dependencies.cmake (original)
+++ incubator/celix/trunk/cmake/Dependencies.cmake 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.
+
MACRO(celix_subproject)
PARSE_ARGUMENTS(OPTION "DEPS" "" ${ARGN})
LIST(GET OPTION_DEFAULT_ARGS 0 OPTION_NAME)
Copied: incubator/celix/trunk/cmake/NOTE (from r1370761, incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/NOTE?p2=incubator/celix/trunk/cmake/NOTE&p1=incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/examples/receiver-2.0/CMakeLists.txt (original)
+++ incubator/celix/trunk/cmake/NOTE Thu Aug 9 21:06:58 2012
@@ -15,9 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-bundle(receiver-2.0 SOURCES activator serviceTest)
-include_directories("${PROJECT_SOURCE_DIR}/celix" "${PROJECT_SOURCE_DIR}/dependency_manager")
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(receiver-2.0 dependency_manager celix_framework)
+All files in this directory are licensed to the Apache Software Foundation (as included above).
+Normally source/txt files should include this header but for templates this sometimes is not possible.
+The following templates do not include the header:
+* config.properties.in
+* run.sh.in
+* RunConfig.in
-package(receiver-2.0 FILES serviceTest.h)
\ No newline at end of file
+This note is added to explicitly mention that the same licensing applies to these files as to any other having the header.
\ No newline at end of file
Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Thu Aug 9 21:06:58 2012
@@ -131,6 +131,24 @@ MACRO(deploy)
GET_DIRECTORY_PROPERTY(PROPS ADDITIONAL_MAKE_CLEAN_FILES)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles")
+
+ message(${PROJECT_BINARY_DIR})
+ message(${DEPLOY_NAME})
+ message(${CMAKE_PROJECT_NAME})
+
+ # Generate an Eclipse launch file to be able to run the deployment from Eclipse
+ string(REPLACE "/" ";" LIST ${PROJECT_BINARY_DIR})
+ list(LENGTH LIST len)
+ MATH(EXPR test "${len} - 1")
+ LIST(GET LIST ${test} last)
+ MESSAGE("${last}")
+
+ SET(CONTAINER_NAME ${DEPLOY_NAME})
+ SET(PROGRAM_NAME ${LAUNCHER})
+ SET(PROJECT_ATTR ${last})
+ SET(WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/")
+
+ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/RunConfig.in ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/${DEPLOY_NAME}.launch @ONLY)
ENDMACRO(deploy)
MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
Copied: incubator/celix/trunk/cmake/RunConfig.in (from r1370761, incubator/celix/trunk/Echo.launch)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/RunConfig.in?p2=incubator/celix/trunk/cmake/RunConfig.in&p1=incubator/celix/trunk/Echo.launch&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/Echo.launch (original)
+++ incubator/celix/trunk/cmake/RunConfig.in Thu Aug 9 21:06:58 2012
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="bad_container_name" value="@CONTAINER_NAME@"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="0"/>
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/launcher/launcher"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="celix"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="@PROGRAM_NAME@"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="@PROJECT_ATTR@"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.macosx.base.1808592147"/>
-<stringAttribute key="org.eclipse.cdt.launch.WORKING_DIRECTORY" value="${workspace_loc:celix/build/deploy/echo}"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="org.eclipse.cdt.core.default.config.1"/>
+<stringAttribute key="org.eclipse.cdt.launch.WORKING_DIRECTORY" value="@WORKING_DIRECTORY@"/>
<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/celix"/>
+<listEntry value="/@PROJECT_ATTR@"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DYLD_LIBRARY_PATH" value="${workspace_loc:celix/build/framework}:${workspace_loc:celix/build/utils}"/>
+<mapEntry key="@LIBRARY_PATH@" value="@FW_PATH@:@UTILS_PATH@"/>
</mapAttribute>
</launchConfiguration>
Modified: incubator/celix/trunk/cmake/modules/FindAPR.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/modules/FindAPR.cmake?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/modules/FindAPR.cmake (original)
+++ incubator/celix/trunk/cmake/modules/FindAPR.cmake Thu Aug 9 21:06:58 2012
@@ -1,4 +1,19 @@
-# -*- cmake -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
# - Find Apache Portable Runtime
# Find the APR includes and libraries
Modified: incubator/celix/trunk/cmake/modules/UseDoxygen.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/modules/UseDoxygen.cmake?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/modules/UseDoxygen.cmake (original)
+++ incubator/celix/trunk/cmake/modules/UseDoxygen.cmake Thu Aug 9 21:06:58 2012
@@ -1,4 +1,30 @@
-# - Run Doxygen
+# Redistribution and use is allowed according to the terms of the New
+# BSD license:
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# - Run Doxygen
#
# Adds a doxygen target that runs doxygen to generate the html
# and optionally the LaTeX API documentation.
@@ -48,7 +74,6 @@
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
macro(usedoxygen_set_default name value type docstring)
Modified: incubator/celix/trunk/dependency_manager/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/dependency_manager/CMakeLists.txt Thu Aug 9 21:06:58 2012
@@ -29,11 +29,16 @@ if (DEPENDENCY_MANAGER)
endif(CMAKE_UNAME)
endif(UNIX AND NOT WIN32)
- add_library(dependency_manager STATIC dependency_manager.c dependency_activator_base.c service_component.c service_dependency.c)
+ add_library(dependency_manager STATIC
+ private/src/dependency_manager
+ private/src/dependency_activator_base
+ private/src/service_component
+ private/src/service_dependency)
+ include_directories("public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
target_link_libraries(dependency_manager celix_framework)
- FILE(GLOB files dependency_activator_base.h service.h dependency_manager.h service_component_private.h service_component.h service_dependency.h)
+ FILE(GLOB files public/include/dependency_activator_base.h public/include/service.h public/include/dependency_manager.h public/include/service_component_private.h public/include/service_component.h public/include/service_dependency.h)
INSTALL(FILES ${files} DESTINATION include/celix/dependency_manager COMPONENT framework)
install(TARGETS dependency_manager DESTINATION lib COMPONENT framework)
endif (DEPENDENCY_MANAGER)
Copied: incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c (from r1370761, incubator/celix/trunk/dependency_manager/dependency_activator_base.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c?p2=incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c&p1=incubator/celix/trunk/dependency_manager/dependency_activator_base.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_activator_base.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/dependency_activator_base.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* dependency_activator_base.c
*
- * Created on: Aug 8, 2010
- * Author: alexanderb
+ * \date Aug 8, 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/dependency_manager/private/src/dependency_manager.c (from r1370761, incubator/celix/trunk/dependency_manager/dependency_manager.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c?p2=incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c&p1=incubator/celix/trunk/dependency_manager/dependency_manager.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_manager.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/dependency_manager.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* dependency_manager.c
*
- * Created on: May 12, 2010
- * Author: dk489
+ * \date May 12, 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/dependency_manager/private/src/service_component.c (from r1370761, incubator/celix/trunk/dependency_manager/service_component.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/service_component.c?p2=incubator/celix/trunk/dependency_manager/private/src/service_component.c&p1=incubator/celix/trunk/dependency_manager/service_component.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_component.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_component.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* service_component.c
*
- * Created on: Aug 8, 2010
- * Author: alexanderb
+ * \date Aug 8, 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/dependency_manager/private/src/service_dependency.c (from r1370761, incubator/celix/trunk/dependency_manager/service_dependency.c)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/private/src/service_dependency.c?p2=incubator/celix/trunk/dependency_manager/private/src/service_dependency.c&p1=incubator/celix/trunk/dependency_manager/service_dependency.c&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_dependency.c (original)
+++ incubator/celix/trunk/dependency_manager/private/src/service_dependency.c Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* service_dependency.c
*
- * Created on: Aug 9, 2010
- * Author: alexanderb
+ * \date Aug 9, 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/dependency_manager/public/include/dependency_activator_base.h (from r1370761, incubator/celix/trunk/dependency_manager/dependency_activator_base.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h?p2=incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h&p1=incubator/celix/trunk/dependency_manager/dependency_activator_base.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_activator_base.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/dependency_activator_base.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* dependency_activator_base.h
*
- * Created on: May 12, 2010
- * Author: dk489
+ * \date May 12, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef DEPENDENCY_ACTIVATOR_BASE_H_
Copied: incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h (from r1370761, incubator/celix/trunk/dependency_manager/dependency_manager.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h?p2=incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h&p1=incubator/celix/trunk/dependency_manager/dependency_manager.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_manager.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/dependency_manager.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* dependency_manager.h
*
- * Created on: May 12, 2010
- * Author: dk489
+ * \date May 12, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef DEPENDENCY_MANAGER_H_
Copied: incubator/celix/trunk/dependency_manager/public/include/service.h (from r1370761, incubator/celix/trunk/dependency_manager/service.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service.h?p2=incubator/celix/trunk/dependency_manager/public/include/service.h&p1=incubator/celix/trunk/dependency_manager/service.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* service.h
*
- * Created on: May 12, 2010
- * Author: dk489
+ * \date May 12, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef SERVICE_H_
Copied: incubator/celix/trunk/dependency_manager/public/include/service_component.h (from r1370761, incubator/celix/trunk/dependency_manager/service_component.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service_component.h?p2=incubator/celix/trunk/dependency_manager/public/include/service_component.h&p1=incubator/celix/trunk/dependency_manager/service_component.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_component.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_component.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* service_component.h
*
- * Created on: Aug 9, 2010
- * Author: alexanderb
+ * \date Aug 9, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef SERVICE_COMPONENT_H_
Copied: incubator/celix/trunk/dependency_manager/public/include/service_component_private.h (from r1370761, incubator/celix/trunk/dependency_manager/service_component_private.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service_component_private.h?p2=incubator/celix/trunk/dependency_manager/public/include/service_component_private.h&p1=incubator/celix/trunk/dependency_manager/service_component_private.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_component_private.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_component_private.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* service_component_private.h
*
- * Created on: Aug 9, 2010
- * Author: alexanderb
+ * \date Aug 9, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef SERVICE_COMPONENT_PRIVATE_H_
Copied: incubator/celix/trunk/dependency_manager/public/include/service_dependency.h (from r1370761, incubator/celix/trunk/dependency_manager/service_dependency.h)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/public/include/service_dependency.h?p2=incubator/celix/trunk/dependency_manager/public/include/service_dependency.h&p1=incubator/celix/trunk/dependency_manager/service_dependency.h&r1=1370761&r2=1371483&rev=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_dependency.h (original)
+++ incubator/celix/trunk/dependency_manager/public/include/service_dependency.h Thu Aug 9 21:06:58 2012
@@ -19,8 +19,9 @@
/*
* service_dependency.h
*
- * Created on: Aug 9, 2010
- * Author: alexanderb
+ * \date Aug 9, 2010
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef SERVICE_DEPENDENCY_H_
Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/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(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admin Service bundles" OFF DEPS framework launcher shell_tui log_writer)
if (DEPLOYMENT_ADMIN)
Modified: incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/deployment_admin.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/deployment_admin.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.
+ */
/*
* deployment_admin.h
*
- * Created on: Nov 7, 2011
- * Author: alexander
+ * \date Nov 7, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef DEPLOYMENT_ADMIN_H_
Modified: incubator/celix/trunk/deployment_admin/private/include/deployment_package.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/deployment_package.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/deployment_package.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/deployment_package.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.
+ */
/*
* deployment_package.h
*
- * Created on: Nov 8, 2011
- * Author: alexander
+ * \date Nov 8, 2011
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef DEPLOYMENT_PACKAGE_H_
Modified: incubator/celix/trunk/deployment_admin/private/include/log.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log.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.
+ */
/*
* log.h
*
- * Created on: Apr 18, 2012
- * Author: alexander
+ * \date Apr 18, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef LOG_H_
Modified: incubator/celix/trunk/deployment_admin/private/include/log_event.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log_event.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log_event.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log_event.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.
+ */
/*
* log_event.h
*
- * Created on: Apr 19, 2012
- * Author: alexander
+ * \date Apr 19, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef LOG_EVENT_H_
Modified: incubator/celix/trunk/deployment_admin/private/include/log_store.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log_store.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log_store.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log_store.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.
+ */
/*
* log_store.h
*
- * Created on: Apr 18, 2012
- * Author: alexander
+ * \date Apr 18, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef LOG_STORE_H_
Modified: incubator/celix/trunk/deployment_admin/private/include/log_sync.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/log_sync.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/log_sync.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/log_sync.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.
+ */
/*
* log_sync.h
*
- * Created on: Apr 19, 2012
- * Author: alexander
+ * \date Apr 19, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef LOG_SYNC_H_
Modified: incubator/celix/trunk/deployment_admin/private/include/miniunz.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/include/miniunz.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/include/miniunz.h (original)
+++ incubator/celix/trunk/deployment_admin/private/include/miniunz.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.
+ */
/*
* miniunz.h
*
- * Created on: Aug 8, 2012
- * Author: alexander
+ * \date Aug 8, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef MINIUNZ_H_
Modified: incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin.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.
+ */
/*
* deployment_admin.c
*
- * Created on: Nov 7, 2011
- * Author: alexander
+ * \date Nov 7, 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/deployment_admin/private/src/deployment_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_admin_activator.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.
+ */
/*
* deployment_admin_activator.c
*
- * Created on: Nov 7, 2011
- * Author: alexander
+ * \date Nov 7, 2011
+ * \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/deployment_admin/private/src/deployment_package.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/deployment_package.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/deployment_package.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/deployment_package.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.
+ */
/*
* deployment_package.c
*
- * Created on: Nov 8, 2011
- * Author: alexander
+ * \date Nov 8, 2011
+ * \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/deployment_admin/private/src/log.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/log.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/log.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/log.c Thu Aug 9 21:06:58 2012
@@ -1,9 +1,30 @@
+/**
+ *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.
+ */
/*
* log.c
*
- * Created on: Apr 19, 2012
- * Author: alexander
+ * \date Apr 19, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
+
+#include <stddef.h>
#include <apr_general.h>
#include "celix_errno.h"
Modified: incubator/celix/trunk/deployment_admin/private/src/log_store.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/log_store.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/log_store.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/log_store.c Thu Aug 9 21:06:58 2012
@@ -1,10 +1,29 @@
+/**
+ *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.
+ */
/*
* log_store.c
*
- * Created on: Apr 18, 2012
- * Author: alexander
+ * \date Apr 18, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
-
+#include <stddef.h>
#include <apr_general.h>
#include <time.h>
Modified: incubator/celix/trunk/deployment_admin/private/src/log_sync.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/log_sync.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/log_sync.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/log_sync.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.
+ */
/*
* log_sync.c
*
- * Created on: Apr 19, 2012
- * Author: alexander
+ * \date Apr 19, 2012
+ * \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/deployment_admin/private/src/miniunz.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/miniunz.c?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/miniunz.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/miniunz.c Thu Aug 9 21:06:58 2012
@@ -1,3 +1,25 @@
+/** License
+ * ----------------------------------------------------------
+ * Condition of use and distribution are the same than zlib :
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ * ----------------------------------------------------------
+/*
/*
miniunz.c
Version 1.1, February 14h, 2010
@@ -10,6 +32,11 @@
Modifications for Zip64 support on both zip and unzip
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+ Changes made to the original source specific for Apache Celix:
+ * Updated several parts to use output directory fitting Celix.
+ * Removed several parts not needed (main function etc).
+ * Added some checks for OSX/Apple
*/
#ifndef _WIN32
Modified: incubator/celix/trunk/deployment_admin/public/include/resource_processor.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/public/include/resource_processor.h?rev=1371483&r1=1371482&r2=1371483&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/public/include/resource_processor.h (original)
+++ incubator/celix/trunk/deployment_admin/public/include/resource_processor.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.
+ */
/*
* resource_processor.h
*
- * Created on: Feb 13, 2012
- * Author: alexander
+ * \date Feb 13, 2012
+ * \author <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project Team</a>
+ * \copyright Apache License, Version 2.0
*/
#ifndef RESOURCE_PROCESSOR_H_