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 2011/05/10 10:21:27 UTC
svn commit: r1101360 [1/5] - in /incubator/celix/trunk: ./ .settings/
celix_test/ dependency_manager/ echo_service/client/ framework/
framework/private/include/ framework/private/src/ hello_world/
hello_world/root/ launcher/ mongoose/ mongoose/MANIFEST...
Author: abroekhuis
Date: Tue May 10 08:21:24 2011
New Revision: 1101360
URL: http://svn.apache.org/viewvc?rev=1101360&view=rev
Log:
Updated some error handling.
Added:
incubator/celix/trunk/.settings/
incubator/celix/trunk/.settings/org.eclipse.cdt.codan.core.prefs (with props)
incubator/celix/trunk/.settings/org.eclipse.cdt.codan.ui.prefs (with props)
incubator/celix/trunk/Echo.launch (with props)
incubator/celix/trunk/WB Dependency Manager.launch (with props)
incubator/celix/trunk/WB Service tracker.launch (with props)
incubator/celix/trunk/celix Default.launch (with props)
incubator/celix/trunk/celix_test/framework_test.c (with props)
incubator/celix/trunk/framework/private/include/bundle_revision.h (with props)
incubator/celix/trunk/framework/private/include/inputstream.h (with props)
incubator/celix/trunk/framework/private/src/bundle_revision.c (with props)
incubator/celix/trunk/hello_world/root/
incubator/celix/trunk/hello_world/root/index.html (with props)
incubator/celix/trunk/mongoose/
incubator/celix/trunk/mongoose/CMakeLists.txt (with props)
incubator/celix/trunk/mongoose/MANIFEST/
incubator/celix/trunk/mongoose/MANIFEST/MANIFEST.MF (with props)
incubator/celix/trunk/mongoose/activator.c (with props)
incubator/celix/trunk/mongoose/mongoose.c (with props)
incubator/celix/trunk/mongoose/mongoose.h (with props)
incubator/celix/trunk/mongoose/root/
incubator/celix/trunk/mongoose/root/index.html (with props)
incubator/celix/trunk/shell/install_command.c (with props)
incubator/celix/trunk/shell/install_command.h (with props)
incubator/celix/trunk/shell/update_command.c (with props)
incubator/celix/trunk/shell/update_command.h (with props)
incubator/celix/trunk/whiteboard/tracker_depman/tracker.c (with props)
incubator/celix/trunk/whiteboard/tracker_depman/tracker.h (with props)
Modified:
incubator/celix/trunk/.cproject
incubator/celix/trunk/.project
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/Hello World.launch
incubator/celix/trunk/celix_test/CMakeLists.txt
incubator/celix/trunk/celix_test/hash_map_test.c
incubator/celix/trunk/celix_test/hash_map_test_hash.c
incubator/celix/trunk/dependency_manager/dependency_activator_base.c
incubator/celix/trunk/dependency_manager/service_component.c
incubator/celix/trunk/dependency_manager/service_component_private.h
incubator/celix/trunk/dependency_manager/service_dependency.c
incubator/celix/trunk/echo_service/client/echo_client.c
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/framework/private/include/attribute.h
incubator/celix/trunk/framework/private/include/bundle.h
incubator/celix/trunk/framework/private/include/bundle_activator.h
incubator/celix/trunk/framework/private/include/bundle_archive.h
incubator/celix/trunk/framework/private/include/bundle_context.h
incubator/celix/trunk/framework/private/include/celix_errno.h
incubator/celix/trunk/framework/private/include/framework.h
incubator/celix/trunk/framework/private/include/headers.h
incubator/celix/trunk/framework/private/include/properties.h
incubator/celix/trunk/framework/private/include/requirement.h
incubator/celix/trunk/framework/private/include/service_registration.h
incubator/celix/trunk/framework/private/include/service_registry.h
incubator/celix/trunk/framework/private/include/version_range.h
incubator/celix/trunk/framework/private/include/wire.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/capability.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/hello_world/CMakeLists.txt
incubator/celix/trunk/hello_world/activator.c
incubator/celix/trunk/launcher/launcher.c
incubator/celix/trunk/shell/CMakeLists.txt
incubator/celix/trunk/shell/ps_command.c
incubator/celix/trunk/shell/ps_command.h
incubator/celix/trunk/shell/shell.c
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_tui/shell_tui.c
incubator/celix/trunk/target.cmake
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/public/include/array_list.h
incubator/celix/trunk/utils/public/include/hash_map.h
incubator/celix/trunk/utils/public/include/linked_list_iterator.h
incubator/celix/trunk/whiteboard/publisherA/activator.c
incubator/celix/trunk/whiteboard/publisherA/publisher.c
incubator/celix/trunk/whiteboard/publisherB/activator.c
incubator/celix/trunk/whiteboard/publisherB/publisher.c
incubator/celix/trunk/whiteboard/tracker/activator.c
incubator/celix/trunk/whiteboard/tracker_depman/CMakeLists.txt
incubator/celix/trunk/whiteboard/tracker_depman/dependency_activator.c
Modified: incubator/celix/trunk/.cproject
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.cproject?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/.cproject (original)
+++ incubator/celix/trunk/.cproject Tue May 10 08:21:24 2011
@@ -34,6 +34,9 @@
<tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.1836612483" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base.1155311834" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base"/>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.base.387685994" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+ <option id="gnu.c.compiler.option.include.paths.544783026" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value="/opt/local/include"/>
+ </option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1627566234" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
</toolChain>
@@ -43,234 +46,251 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
- <storageModule moduleId="scannerConfiguration">
- <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.1808592147;cdt.managedbuild.toolchain.gnu.macosx.base.1808592147.1856684693;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.387685994;cdt.managedbuild.tool.gnu.c.compiler.input.1627566234">
- <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="makefileGenerator">
- <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- </scannerConfigBuildInfo>
- </storageModule>
- <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
- <buildTargets>
- <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>make</buildCommand>
- <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
- <buildTarget>all</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>true</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- <target name="deploy" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>make</buildCommand>
- <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
- <buildTarget>deploy</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>true</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- <target name="run cmake" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>cmake</buildCommand>
- <buildTarget>-E chdir ${workspace_loc:/celix}/build cmake -G "Unix Makefiles" ../</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>false</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- <target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>make</buildCommand>
- <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
- <buildTarget>clean</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>true</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- <target name="help" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>make</buildCommand>
- <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
- <buildTarget>help</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>true</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- <target name="install-fw" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>make</buildCommand>
- <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
- <buildTarget>install-fw</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>true</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- <target name="framework" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
- <buildCommand>make</buildCommand>
- <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
- <buildTarget>framework</buildTarget>
- <stopOnError>true</stopOnError>
- <useDefaultCommand>true</useDefaultCommand>
- <runAllBuilders>true</runAllBuilders>
- </target>
- </buildTargets>
- </storageModule>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="c-osgi.null.931222562" name="c-osgi"/>
</storageModule>
+ <storageModule moduleId="scannerConfiguration">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+ <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="makefileGenerator">
+ <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.1808592147;cdt.managedbuild.toolchain.gnu.macosx.base.1808592147.1856684693;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.387685994;cdt.managedbuild.tool.gnu.c.compiler.input.1627566234">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+ <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="makefileGenerator">
+ <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+ <buildOutputProvider>
+ <openAction enabled="true" filePath=""/>
+ <parser enabled="true"/>
+ </buildOutputProvider>
+ <scannerInfoProvider id="specsFile">
+ <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
+ <parser enabled="true"/>
+ </scannerInfoProvider>
+ </profile>
+ </scannerConfigBuildInfo>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+ <buildTargets>
+ <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C /Users/alexanderb/Documents/Celix/celix/build</buildArguments>
+ <buildTarget>all</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>false</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="deploy" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C /Users/alexanderb/Documents/workspace-c/celix/build</buildArguments>
+ <buildTarget>deploy</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="run cmake" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>cmake</buildCommand>
+ <buildTarget>-E chdir ${workspace_loc:/celix}/build cmake -G "Unix Makefiles" ../</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>false</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C ${workspace_loc:/celix}/build</buildArguments>
+ <buildTarget>clean</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="help" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C ${workspace_loc:/celix}/build</buildArguments>
+ <buildTarget>help</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="install-fw" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C ${workspace_loc:/celix}/build</buildArguments>
+ <buildTarget>install-fw</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="framework" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C ${workspace_loc:/celix}/build</buildArguments>
+ <buildTarget>framework</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="test" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C ${workspace_loc:/celix}/build</buildArguments>
+ <buildTarget>test</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>true</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ <target name="bundles" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+ <buildCommand>make</buildCommand>
+ <buildArguments>-C ${workspace_loc:/celix}/build</buildArguments>
+ <buildTarget>bundles</buildTarget>
+ <stopOnError>true</stopOnError>
+ <useDefaultCommand>false</useDefaultCommand>
+ <runAllBuilders>true</runAllBuilders>
+ </target>
+ </buildTargets>
+ </storageModule>
+ <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>
Modified: incubator/celix/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.project?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/.project (original)
+++ incubator/celix/trunk/.project Tue May 10 08:21:24 2011
@@ -72,10 +72,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.codan.core.codanBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.codan.core.codanNature</nature>
</natures>
</projectDescription>
Added: incubator/celix/trunk/.settings/org.eclipse.cdt.codan.core.prefs
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.settings/org.eclipse.cdt.codan.core.prefs?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/.settings/org.eclipse.cdt.codan.core.prefs (added)
+++ incubator/celix/trunk/.settings/org.eclipse.cdt.codan.core.prefs Tue May 10 08:21:24 2011
@@ -0,0 +1,58 @@
+#Wed Apr 13 14:04:28 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.cdt.codan.checkers.errnoreturn=Warning
+org.eclipse.cdt.codan.checkers.errnoreturn.params={implicit\=>false}
+org.eclipse.cdt.codan.checkers.errreturnvalue=Error
+org.eclipse.cdt.codan.checkers.errreturnvalue.params={}
+org.eclipse.cdt.codan.checkers.noreturn=Error
+org.eclipse.cdt.codan.checkers.noreturn.params={implicit\=>false}
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={}
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={}
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
+org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
+org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={unknown\=>false,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={}
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={}
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={}
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={macro\=>true,exceptions\=>()}
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={paramNot\=>false}
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={else\=>false}
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
Propchange: incubator/celix/trunk/.settings/org.eclipse.cdt.codan.core.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/celix/trunk/.settings/org.eclipse.cdt.codan.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.settings/org.eclipse.cdt.codan.ui.prefs?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/.settings/org.eclipse.cdt.codan.ui.prefs (added)
+++ incubator/celix/trunk/.settings/org.eclipse.cdt.codan.ui.prefs Tue May 10 08:21:24 2011
@@ -0,0 +1,3 @@
+#Wed Apr 13 14:04:28 CEST 2011
+eclipse.preferences.version=1
+onBuild=true
Propchange: incubator/celix/trunk/.settings/org.eclipse.cdt.codan.ui.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Tue May 10 08:21:24 2011
@@ -42,24 +42,25 @@ add_subdirectory(framework)
#include(CPackConfig.in)
include(Packaging.cmake)
-add_subdirectory(dependency_manager)
+#add_subdirectory(dependency_manager)
add_subdirectory(launcher)
-add_subdirectory(test)
+#add_subdirectory(test)
add_subdirectory(shell)
add_subdirectory(shell_tui)
-add_subdirectory(receiver)
-add_subdirectory(receiver-2.0)
-add_subdirectory(sender)
+#add_subdirectory(receiver)
+#add_subdirectory(receiver-2.0)
+#add_subdirectory(sender)
add_subdirectory(hello_world)
-add_subdirectory(echo_service/client)
-add_subdirectory(echo_service/server)
-add_subdirectory(whiteboard)
+add_subdirectory(mongoose)
+#add_subdirectory(echo_service/client)
+#add_subdirectory(echo_service/server)
+#add_subdirectory(whiteboard)
#add_subdirectory(echo_service)
-add_subdirectory(celix_test)
+#add_subdirectory(celix_test)
include(target.cmake)
enable_testing()
\ No newline at end of file
Added: incubator/celix/trunk/Echo.launch
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/Echo.launch?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/Echo.launch (added)
+++ incubator/celix/trunk/Echo.launch Tue May 10 08:21:24 2011
@@ -0,0 +1,20 @@
+<?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="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"/>
+<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}"/>
+<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/celix"/>
+</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}"/>
+</mapAttribute>
+</launchConfiguration>
Propchange: incubator/celix/trunk/Echo.launch
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/celix/trunk/Hello World.launch
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/Hello%20World.launch?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/Hello World.launch (original)
+++ incubator/celix/trunk/Hello World.launch Tue May 10 08:21:24 2011
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.AUTO_SOLIB" value="true"/>
+<listAttribute key="org.eclipse.cdt.debug.mi.core.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.GDB_INIT" value=".gdbinit"/>
+<listAttribute key="org.eclipse.cdt.debug.mi.core.SOLIB_PATH"/>
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.STOP_ON_SOLIB_EVENTS" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.breakpointsFullPath" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="org.eclipse.cdt.debug.mi.core.standardCommandFactory"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
@@ -9,16 +19,23 @@
<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<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.DEBUGGER_ID" value="gdb"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<booleanAttribute key="org.eclipse.cdt.launch.ENABLE_REGISTER_BOOKKEEPING" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.launch.ENABLE_VARIABLE_BOOKKEEPING" value="false"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?><contentList/>"/>
+<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <globalVariableList/> "/>
+<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList/> "/>
<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.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
+<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/hello_world}"/>
+<booleanAttribute key="org.eclipse.cdt.launch.ui.ApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/celix"/>
@@ -29,5 +46,8 @@
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="DYLD_LIBRARY_PATH" value="${workspace_loc:celix/build/framework}:${workspace_loc:celix/build/utils}"/>
</mapAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.cdt.dsf.gdb.launch.localCLaunch"/>
+</mapAttribute>
<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList context="reserved-for-future-use"/> "/>
</launchConfiguration>
Added: incubator/celix/trunk/WB Dependency Manager.launch
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/WB%20Dependency%20Manager.launch?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/WB Dependency Manager.launch (added)
+++ incubator/celix/trunk/WB Dependency Manager.launch Tue May 10 08:21:24 2011
@@ -0,0 +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="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"/>
+<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/wb_dp}"/>
+<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/celix"/>
+</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}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList context="reserved-for-future-use"/> "/>
+</launchConfiguration>
Propchange: incubator/celix/trunk/WB Dependency Manager.launch
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/celix/trunk/WB Service tracker.launch
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/WB%20Service%20tracker.launch?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/WB Service tracker.launch (added)
+++ incubator/celix/trunk/WB Service tracker.launch Tue May 10 08:21:24 2011
@@ -0,0 +1,20 @@
+<?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="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"/>
+<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/wb}"/>
+<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/celix"/>
+</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}"/>
+</mapAttribute>
+</launchConfiguration>
Propchange: incubator/celix/trunk/WB Service tracker.launch
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/celix/trunk/celix Default.launch
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/celix%20Default.launch?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/celix Default.launch (added)
+++ incubator/celix/trunk/celix Default.launch Tue May 10 08:21:24 2011
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.linuxtools.valgrind.launch.valgrindLaunch">
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<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"/>
+<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/hello_world}"/>
+<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/celix"/>
+</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}"/>
+</mapAttribute>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.BRANCH_SIM" value="false"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.CACHE_SIM" value="true"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.D1" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.D1_ASSOC" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.D1_LSIZE" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.D1_SIZE" value="0"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.I1" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.I1_ASSOC" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.I1_LSIZE" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.I1_SIZE" value="0"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.L2" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.L2_ASSOC" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.L2_LSIZE" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.cachegrind.L2_SIZE" value="0"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_BELOWMAIN" value="false"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_DEMANGLE" value="true"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_DSYMUTIL" value="true"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_ERRLIMIT" value="true"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_FREERES" value="true"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_MAINSTACK" value="0"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_MAINSTACK_BOOL" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_MAXFRAME" value="2000000"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_NUMCALLERS" value="12"/>
+<listAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_SUPPFILES"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.launch.GENERAL_TRACECHILD" value="true"/>
+<stringAttribute key="org.eclipse.linuxtools.valgrind.launch.OUTPUT_DIR" value="/Users/alexanderb/Documents/Celix/.metadata/.plugins/org.eclipse.linuxtools.valgrind.launch"/>
+<stringAttribute key="org.eclipse.linuxtools.valgrind.launch.TOOL" value="org.eclipse.linuxtools.valgrind.launch.memcheck"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_ALIGNMENT_BOOL" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_ALIGNMENT_VAL" value="0"/>
+<listAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_ALLOCFN"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_DEPTH" value="30"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_DETAILEDFREQ" value="10"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_HEAP" value="true"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_HEAPADMIN" value="8"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_MAXSNAPSHOTS" value="100"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_PEAKINACCURACY" value="10"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_STACKS" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_THRESHOLD" value="10"/>
+<stringAttribute key="org.eclipse.linuxtools.valgrind.massif.MASSIF_TIMEUNIT" value="i"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_ALIGNMENT_BOOL" value="false"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_ALIGNMENT_VAL" value="0"/>
+<intAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_FREELIST" value="10000000"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_GCCWORK" value="false"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_LEAKCHECK" value="true"/>
+<stringAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_LEAKRES" value="low"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_PARTIAL" value="false"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_SHOWREACH" value="false"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_TRACKORIGINS" value="false"/>
+<booleanAttribute key="org.eclipse.linuxtools.valgrind.memcheck.MEMCHECK_UNDEF" value="true"/>
+</launchConfiguration>
Propchange: incubator/celix/trunk/celix Default.launch
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/celix/trunk/celix_test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/celix_test/CMakeLists.txt?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/celix_test/CMakeLists.txt (original)
+++ incubator/celix/trunk/celix_test/CMakeLists.txt Tue May 10 08:21:24 2011
@@ -30,8 +30,12 @@ target_link_libraries(hash_map_test_hash
add_executable(array_list_test array_list_test.c)
target_link_libraries(array_list_test framework cunit ncurses)
+add_executable(framework_test framework_test.c)
+target_link_libraries(framework_test framework cunit ncurses)
+
enable_testing()
#add_test (tester ${EXECUTABLE_OUTPUT_PATH}/tester)
add_test (hash_map_test ${EXECUTABLE_OUTPUT_PATH}/hash_map_test)
add_test (hash_map_test_hash ${EXECUTABLE_OUTPUT_PATH}/hash_map_test_hash)
-add_test (array_list_test ${EXECUTABLE_OUTPUT_PATH}/array_list_test)
\ No newline at end of file
+add_test (array_list_test ${EXECUTABLE_OUTPUT_PATH}/array_list_test)
+add_test (framework_test ${EXECUTABLE_OUTPUT_PATH}/framework_test)
\ No newline at end of file
Added: incubator/celix/trunk/celix_test/framework_test.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/celix_test/framework_test.c?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/celix_test/framework_test.c (added)
+++ incubator/celix/trunk/celix_test/framework_test.c Tue May 10 08:21:24 2011
@@ -0,0 +1,68 @@
+/**
+ *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.
+ */
+/*
+ * test.c
+ *
+ * Created on: Jul 16, 2010
+ * Author: alexanderb
+ */
+#include <stdio.h>
+
+#include "CUnit/Basic.h"
+#include "framework.h"
+
+void test_framework_create(void) {
+ struct framework * framework;
+ framework_create(&framework);
+
+
+ CU_ASSERT(framework == NULL);
+}
+
+
+int main (int argc, char** argv) {
+ CU_pSuite pSuite = NULL;
+
+ /* initialize the CUnit test registry */
+ if (CUE_SUCCESS != CU_initialize_registry())
+ return CU_get_error();
+
+ /* add a suite to the registry */
+ pSuite = CU_add_suite("Suite_1", NULL, NULL);
+ if (NULL == pSuite) {
+ CU_cleanup_registry();
+ return CU_get_error();
+ }
+
+ /* add the tests to the suite */
+ if (
+ NULL == CU_add_test(pSuite, "Framework Creation Test", test_framework_create)
+// || NULL == CU_add_test(pSuite, "List Add Test", test_linkedList_add)
+ )
+ {
+ CU_cleanup_registry();
+ return CU_get_error();
+ }
+
+ /* Run all tests using the CUnit Basic interface */
+ CU_basic_set_mode(CU_BRM_VERBOSE);
+ CU_basic_run_tests();
+ CU_cleanup_registry();
+ return CU_get_error();
+}
Propchange: incubator/celix/trunk/celix_test/framework_test.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/celix/trunk/celix_test/hash_map_test.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/celix_test/hash_map_test.c?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/celix_test/hash_map_test.c (original)
+++ incubator/celix/trunk/celix_test/hash_map_test.c Tue May 10 08:21:24 2011
@@ -23,6 +23,7 @@
* Author: alexanderb
*/
#include <stdio.h>
+#include <stdbool.h>
#include "CUnit/Basic.h"
@@ -71,12 +72,12 @@ void test_hashMap_size(void) {
CU_ASSERT_EQUAL(map->size, 2);
// Clear map
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
CU_ASSERT_EQUAL(map->size, 0);
}
void test_hashMap_isEmpty(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
CU_ASSERT_EQUAL(map->size, 0);
CU_ASSERT_TRUE(hashMap_isEmpty(map));
@@ -94,7 +95,7 @@ void test_hashMap_isEmpty(void) {
}
void test_hashMap_get(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -129,7 +130,7 @@ void test_hashMap_get(void) {
}
void test_hashMap_containsKey(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -156,7 +157,7 @@ void test_hashMap_containsKey(void) {
}
void test_hashMap_getEntry(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -194,7 +195,7 @@ void test_hashMap_getEntry(void) {
}
void test_hashMap_put(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -217,7 +218,7 @@ void test_hashMap_put(void) {
char * nvalue2 = "value3";
char * old = (char *) hashMap_put(map, nkey2, nvalue2);
CU_ASSERT_PTR_NOT_NULL_FATAL(old);
- CU_ASSERT_STRING_EQUAL(old, value2)
+ CU_ASSERT_STRING_EQUAL(old, value2);
get = hashMap_get(map, key2);
CU_ASSERT_STRING_EQUAL(get, nvalue2);
@@ -240,7 +241,7 @@ void test_hashMap_put(void) {
}
void test_hashMap_resize(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
CU_ASSERT_EQUAL(map->size, 0);
CU_ASSERT_EQUAL(map->tablelength, 16);
@@ -265,7 +266,7 @@ void test_hashMap_resize(void) {
}
void test_hashMap_remove(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -298,7 +299,7 @@ void test_hashMap_remove(void) {
}
void test_hashMap_removeMapping(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -331,7 +332,7 @@ void test_hashMap_removeMapping(void) {
}
void test_hashMap_clear(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
char * value = "value";
@@ -352,12 +353,12 @@ void test_hashMap_clear(void) {
char * value4 = NULL;
hashMap_put(map, key4, value4);
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
CU_ASSERT_EQUAL(map->size, 0);
}
void test_hashMap_containsValue(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
Modified: incubator/celix/trunk/celix_test/hash_map_test_hash.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/celix_test/hash_map_test_hash.c?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/celix_test/hash_map_test_hash.c (original)
+++ incubator/celix/trunk/celix_test/hash_map_test_hash.c Tue May 10 08:21:24 2011
@@ -48,7 +48,7 @@ unsigned int test_hashKeyChar(void * k)
}
unsigned int test_hashValueChar(void * v) {
-
+ return 0;
}
int test_equalsKeyChar(void * k, void * o) {
@@ -69,7 +69,7 @@ int setup(void) {
}
void test_hashMap_get(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -109,7 +109,7 @@ void test_hashMap_get(void) {
}
void test_hashMap_containsKey(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -140,7 +140,7 @@ void test_hashMap_containsKey(void) {
}
void test_hashMap_getEntry(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -185,7 +185,7 @@ void test_hashMap_getEntry(void) {
}
void test_hashMap_put(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -237,7 +237,7 @@ void test_hashMap_put(void) {
}
void test_hashMap_remove(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
@@ -273,7 +273,7 @@ void test_hashMap_remove(void) {
}
void test_hashMap_containsValue(void) {
- hashMap_clear(map);
+ hashMap_clear(map, false, false);
// Add one entry
char * key = "key";
Modified: incubator/celix/trunk/dependency_manager/dependency_activator_base.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/dependency_activator_base.c?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_activator_base.c (original)
+++ incubator/celix/trunk/dependency_manager/dependency_activator_base.c Tue May 10 08:21:24 2011
@@ -29,9 +29,6 @@
#include "service_component_private.h"
#include "dependency_activator_base.h"
-DEPENDENCY_MANAGER m_manager;
-BUNDLE_CONTEXT m_context;
-
struct dependencyActivatorBase {
DEPENDENCY_MANAGER manager;
BUNDLE_CONTEXT context;
@@ -58,12 +55,14 @@ void bundleActivator_start(void * userDa
void bundleActivator_stop(void * userData, BUNDLE_CONTEXT context) {
DEPENDENCY_ACTIVATOR_BASE data = (DEPENDENCY_ACTIVATOR_BASE) userData;
dm_destroy(data->userData, data->context, data->manager);
- m_manager = NULL;
- m_context = NULL;
+ data->userData = NULL;
+ data->context = NULL;
+ data->manager = NULL;
}
void bundleActivator_destroy(void * userData) {
-
+ DEPENDENCY_ACTIVATOR_BASE data = (DEPENDENCY_ACTIVATOR_BASE) userData;
+ free(data);
}
SERVICE dependencyActivatorBase_createService(DEPENDENCY_MANAGER manager) {
Modified: incubator/celix/trunk/dependency_manager/service_component.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/service_component.c?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_component.c (original)
+++ incubator/celix/trunk/dependency_manager/service_component.c Tue May 10 08:21:24 2011
@@ -119,6 +119,7 @@ SERVICE serviceComponent_addServiceDepen
service->state = new;
pthread_mutex_unlock(&service->mutex);
serviceComponent_calculateStateChanges(service, old, new);
+ state_destroy(old);
return service;
}
@@ -139,6 +140,7 @@ SERVICE serviceComponent_removeServiceDe
service->state = new;
pthread_mutex_unlock(&service->mutex);
serviceComponent_calculateStateChanges(service, old, new);
+ state_destroy(old);
return service;
}
@@ -151,6 +153,7 @@ void serviceComponent_dependencyAvailabl
service->state = new;
pthread_mutex_unlock(&service->mutex);
serviceComponent_calculateStateChanges(service, old, new);
+ state_destroy(old);
if (state_isTrackingOptional(new)) {
executor_enqueue(service->executor, service, serviceComponent_updateInstance, dependency);
executor_execute(service->executor);
@@ -176,6 +179,7 @@ void serviceComponent_dependencyUnavaila
service->state = new;
pthread_mutex_unlock(&service->mutex);
serviceComponent_calculateStateChanges(service, old, new);
+ state_destroy(old);
if (state_isTrackingOptional(new)) {
executor_enqueue(service->executor, service, serviceComponent_updateInstance, dependency);
executor_execute(service->executor);
@@ -191,6 +195,7 @@ void serviceComponent_start(SERVICE serv
service->state = new;
pthread_mutex_unlock(&service->mutex);
serviceComponent_calculateStateChanges(service, old, new);
+ state_destroy(old);
}
void serviceComponent_stop(SERVICE service) {
@@ -201,6 +206,7 @@ void serviceComponent_stop(SERVICE servi
service->state = new;
pthread_mutex_unlock(&service->mutex);
serviceComponent_calculateStateChanges(service, old, new);
+ state_destroy(old);
serviceRegistration_unregister(service->serviceRegistration);
}
@@ -243,6 +249,7 @@ void serviceComponent_startTrackingOptio
serviceDependency_start(dependency, service);
}
}
+ arrayListIterator_destroy(i);
}
void serviceComponent_stopTrackingOptional(SERVICE service, STATE state) {
@@ -253,6 +260,7 @@ void serviceComponent_stopTrackingOption
serviceDependency_stop(dependency, service);
}
}
+ arrayListIterator_destroy(i);
}
void serviceComponent_startTrackingRequired(SERVICE service, void * arg) {
@@ -264,6 +272,7 @@ void serviceComponent_startTrackingRequi
serviceDependency_start(dependency, service);
}
}
+ arrayListIterator_destroy(i);
}
void serviceComponent_stopTrackingRequired(SERVICE service, void * arg) {
@@ -275,6 +284,7 @@ void serviceComponent_stopTrackingRequir
serviceDependency_stop(dependency, service);
}
}
+ arrayListIterator_destroy(i);
}
void serviceComponent_initService(SERVICE service) {
@@ -291,6 +301,7 @@ void serviceComponent_configureService(S
serviceDependency_invokeAdded(dependency);
}
}
+ arrayListIterator_destroy(i);
}
void serviceComponent_destroyService(SERVICE service, STATE state) {
@@ -301,6 +312,7 @@ void serviceComponent_destroyService(SER
serviceDependency_invokeRemoved(dependency);
}
}
+ arrayListIterator_destroy(i);
}
void serviceComponent_registerService(SERVICE service) {
@@ -353,6 +365,14 @@ STATE state_create(ARRAY_LIST dependenci
return state;
}
+void state_destroy(STATE state) {
+ arrayList_destroy(state->dependencies);
+ state->dependencies = NULL;
+ state->state = STATE_INACTIVE;
+ free(state);
+ state = NULL;
+}
+
bool state_isInactive(STATE state) {
return state->state == STATE_INACTIVE;
}
Modified: incubator/celix/trunk/dependency_manager/service_component_private.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/service_component_private.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_component_private.h (original)
+++ incubator/celix/trunk/dependency_manager/service_component_private.h Tue May 10 08:21:24 2011
@@ -86,6 +86,7 @@ char * serviceComponent_getName(SERVICE
STATE state_create(ARRAY_LIST dependencies, bool active);
+void state_destroy(STATE state);
bool state_isInactive(STATE state);
bool state_isWaitingForRequired(STATE state);
bool state_isTrackingOptional(STATE state);
Modified: incubator/celix/trunk/dependency_manager/service_dependency.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/service_dependency.c?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/service_dependency.c (original)
+++ incubator/celix/trunk/dependency_manager/service_dependency.c Tue May 10 08:21:24 2011
@@ -38,6 +38,7 @@ SERVICE_DEPENDENCY serviceDependency_cre
SERVICE_DEPENDENCY dependency = (SERVICE_DEPENDENCY) malloc(sizeof(*dependency));
dependency->context = context;
dependency->autoConfigureField = NULL;
+ dependency->available = false;
return dependency;
}
@@ -134,10 +135,12 @@ void serviceDependency_invokeRemoved(SER
SERVICE_DEPENDENCY serviceDependency_setService(SERVICE_DEPENDENCY dependency, char * serviceName, char * filter) {
dependency->trackedServiceName = serviceName;
// dependency->filter = filter;
+ return dependency;
}
SERVICE_DEPENDENCY serviceDependency_setRequired(SERVICE_DEPENDENCY dependency, bool required) {
dependency->required = required;
+ return dependency;
}
SERVICE_DEPENDENCY serviceDependency_setAutoConfigure(SERVICE_DEPENDENCY dependency, void ** field) {
Modified: incubator/celix/trunk/echo_service/client/echo_client.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/echo_service/client/echo_client.c?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/echo_service/client/echo_client.c (original)
+++ incubator/celix/trunk/echo_service/client/echo_client.c Tue May 10 08:21:24 2011
@@ -39,6 +39,7 @@ void * trk_send(void * handle) {
sleep(1);
}
pthread_exit(NULL);
+ return NULL;
}
ECHO_CLIENT echoClient_create(SERVICE_TRACKER echoServiceTracker) {
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Tue May 10 08:21:24 2011
@@ -21,6 +21,6 @@ aux_source_directory("private/src" SRC)
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
add_library(framework SHARED ${SRC})
-target_link_libraries(framework utils z apr-1)
+target_link_libraries(framework utils z apr-1 curl)
install(TARGETS framework LIBRARY DESTINATION lib COMPONENT framework)
Modified: incubator/celix/trunk/framework/private/include/attribute.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/attribute.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/attribute.h (original)
+++ incubator/celix/trunk/framework/private/include/attribute.h Tue May 10 08:21:24 2011
@@ -34,6 +34,7 @@ struct attribute {
typedef struct attribute * ATTRIBUTE;
ATTRIBUTE attribute_create(char * key, char * value);
+void attribute_destroy(ATTRIBUTE attribute);
#endif /* ATTRIBUTE_H_ */
Modified: incubator/celix/trunk/framework/private/include/bundle.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle.h Tue May 10 08:21:24 2011
@@ -33,24 +33,31 @@
celix_status_t bundle_create(BUNDLE * bundle, apr_pool_t *mp);
celix_status_t bundle_createFromArchive(BUNDLE * bundle, FRAMEWORK framework, BUNDLE_ARCHIVE archive);
+celix_status_t bundle_destroy(BUNDLE bundle);
+bool bundle_isSystemBundle(BUNDLE bundle);
BUNDLE_ARCHIVE bundle_getArchive(BUNDLE bundle);
-MODULE bundle_getModule(BUNDLE bundle);
+MODULE bundle_getCurrentModule(BUNDLE bundle);
void * bundle_getHandle(BUNDLE bundle);
void bundle_setHandle(BUNDLE bundle, void * handle);
ACTIVATOR bundle_getActivator(BUNDLE bundle);
void bundle_setActivator(BUNDLE bundle, ACTIVATOR activator);
+MANIFEST bundle_getManifest(BUNDLE bundle);
+void bundle_setManifest(BUNDLE bundle, MANIFEST manifest);
BUNDLE_CONTEXT bundle_getContext(BUNDLE bundle);
void bundle_setContext(BUNDLE bundle, BUNDLE_CONTEXT context);
+celix_status_t bundle_getEntry(BUNDLE bundle, char * name, char **entry);
void startBundle(BUNDLE bundle, int options);
-
+celix_status_t bundle_update(BUNDLE bundle, char *inputFile);
void stopBundle(BUNDLE bundle, int options);
-//void updateBundle(BUNDLE bundle, InputStream input);
+celix_status_t bundle_setPersistentStateInactive(BUNDLE bundle);
void uninstallBundle(BUNDLE bundle);
+celix_status_t bundle_revise(BUNDLE bundle, char * location, char *inputFile);
+
// Service Reference Functions
ARRAY_LIST getUsingBundles(SERVICE_REFERENCE reference);
Modified: incubator/celix/trunk/framework/private/include/bundle_activator.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle_activator.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle_activator.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle_activator.h Tue May 10 08:21:24 2011
@@ -28,9 +28,9 @@
#include "headers.h"
-void * bundleActivator_create();
-void bundleActivator_start(void * userData, BUNDLE_CONTEXT context);
-void bundleActivator_stop(void * userData, BUNDLE_CONTEXT context);
-void bundleActivator_destroy(void * userData);
+celix_status_t bundleActivator_create(BUNDLE_CONTEXT context, void **userData);
+celix_status_t bundleActivator_start(void * userData, BUNDLE_CONTEXT context);
+celix_status_t bundleActivator_stop(void * userData, BUNDLE_CONTEXT context);
+celix_status_t bundleActivator_destroy(void * userData, BUNDLE_CONTEXT context);
#endif /* BUNDLE_ACTIVATOR_H_ */
Modified: incubator/celix/trunk/framework/private/include/bundle_archive.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle_archive.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle_archive.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle_archive.h Tue May 10 08:21:24 2011
@@ -28,20 +28,27 @@
#include <apr-1/apr_general.h>
+#include "bundle_revision.h"
#include "bundle_state.h"
+#include "celix_errno.h"
typedef struct bundleArchive * BUNDLE_ARCHIVE;
BUNDLE_ARCHIVE bundleArchive_create(char * archiveRoot, long id, char * location, apr_pool_t *mp);
+celix_status_t bundleArchive_destroy(BUNDLE_ARCHIVE archive);
BUNDLE_ARCHIVE bundleArchive_createSystemBundleArchive(apr_pool_t *mp);
BUNDLE_ARCHIVE bundleArchive_recreate(char * archiveRoot, apr_pool_t *mp);
long bundleArchive_getId(BUNDLE_ARCHIVE archive);
char * bundleArchive_getLocation(BUNDLE_ARCHIVE archive);
char * bundleArchive_getArchiveRoot(BUNDLE_ARCHIVE archive);
-char * bundleArchive_getRevision(BUNDLE_ARCHIVE archive);
+BUNDLE_REVISION bundleArchive_getCurrentRevision(BUNDLE_ARCHIVE archive);
+BUNDLE_REVISION bundleArchive_getRevision(BUNDLE_ARCHIVE archive, long revNr);
BUNDLE_STATE bundleArchive_getPersistentState(BUNDLE_ARCHIVE archive);
-void bundleArchive_revise(BUNDLE_ARCHIVE archive, char * location);
+long bundleArchive_getRefreshCount(BUNDLE_ARCHIVE archive);
+long bundleArchive_getCurrentRevisionNumber(BUNDLE_ARCHIVE archive);
+void bundleArchive_revise(BUNDLE_ARCHIVE archive, char * location, char *inputFile);
void bundleArchive_close(BUNDLE_ARCHIVE archive);
void bundleArchive_closeAndDelete(BUNDLE_ARCHIVE archive);
+time_t bundleArchive_getLastModified(BUNDLE_ARCHIVE archive);
#endif /* BUNDLE_ARCHIVE_H_ */
Modified: incubator/celix/trunk/framework/private/include/bundle_context.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle_context.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle_context.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle_context.h Tue May 10 08:21:24 2011
@@ -30,13 +30,16 @@
BUNDLE_CONTEXT bundleContext_create(FRAMEWORK framework, BUNDLE bundle);
+BUNDLE bundleContext_getBundle(BUNDLE_CONTEXT context);
FRAMEWORK bundleContext_getFramework(BUNDLE_CONTEXT context);
+apr_pool_t *bundleContext_getMemoryPool(BUNDLE_CONTEXT context);
+
BUNDLE bundleContext_installBundle(BUNDLE_CONTEXT context, char * location);
SERVICE_REGISTRATION bundleContext_registerService(BUNDLE_CONTEXT context, char * serviceName, void * svcObj, PROPERTIES properties);
-ARRAY_LIST getServiceReferences(BUNDLE_CONTEXT context, char * serviceName, char * filter);
+ARRAY_LIST bundleContext_getServiceReferences(BUNDLE_CONTEXT context, char * serviceName, char * filter);
SERVICE_REFERENCE bundleContext_getServiceReference(BUNDLE_CONTEXT context, char * serviceName);
void * bundleContext_getService(BUNDLE_CONTEXT context, SERVICE_REFERENCE reference);
@@ -45,8 +48,8 @@ bool bundleContext_ungetService(BUNDLE_C
ARRAY_LIST bundleContext_getBundles(BUNDLE_CONTEXT context);
BUNDLE bundleContext_getBundleById(BUNDLE_CONTEXT context, long id);
-void addServiceListener(BUNDLE_CONTEXT context, SERVICE_LISTENER listener, char * filter);
-void removeServiceListener(BUNDLE_CONTEXT context, SERVICE_LISTENER listener);
+void bundleContext_addServiceListener(BUNDLE_CONTEXT context, SERVICE_LISTENER listener, char * filter);
+void bundleContext_removeServiceListener(BUNDLE_CONTEXT context, SERVICE_LISTENER listener);
#endif /* BUNDLE_CONTEXT_H_ */
Added: incubator/celix/trunk/framework/private/include/bundle_revision.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle_revision.h?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle_revision.h (added)
+++ incubator/celix/trunk/framework/private/include/bundle_revision.h Tue May 10 08:21:24 2011
@@ -0,0 +1,21 @@
+/*
+ * bundle_revision.h
+ *
+ * Created on: Apr 12, 2011
+ * Author: alexanderb
+ */
+
+#ifndef BUNDLE_REVISION_H_
+#define BUNDLE_REVISION_H_
+
+#include <stdio.h>
+
+typedef struct bundleRevision * BUNDLE_REVISION;
+
+BUNDLE_REVISION bundleRevision_create(char *root, char *location, long revisionNr, char *inputFile);
+void bundleRevision_destroy(BUNDLE_REVISION revision);
+long bundleRevision_getNumber(BUNDLE_REVISION revision);
+char * bundleRevision_getLocation(BUNDLE_REVISION revision);
+char * bundleRevision_getRoot(BUNDLE_REVISION revision);
+
+#endif /* BUNDLE_REVISION_H_ */
Propchange: incubator/celix/trunk/framework/private/include/bundle_revision.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/celix/trunk/framework/private/include/celix_errno.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/celix_errno.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/celix_errno.h (original)
+++ incubator/celix/trunk/framework/private/include/celix_errno.h Tue May 10 08:21:24 2011
@@ -22,6 +22,7 @@ typedef int celix_status_t;
#define CELIX_INVALID_SYNTAX (CELIX_START_ERROR + 4)
#define CELIX_FRAMEWORK_SHUTDOWN (CELIX_START_ERROR + 5)
#define CELIX_ILLEGAL_STATE (CELIX_START_ERROR + 6)
+#define CELIX_FRAMEWORK_EXCEPTION (CELIX_START_ERROR + 7)
#define CELIX_ENOMEM ENOMEM
Modified: incubator/celix/trunk/framework/private/include/framework.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/framework.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/framework.h (original)
+++ incubator/celix/trunk/framework/private/include/framework.h Tue May 10 08:21:24 2011
@@ -34,12 +34,17 @@
#include "celix_errno.h"
celix_status_t framework_create(FRAMEWORK *framework);
+celix_status_t framework_destroy(FRAMEWORK framework);
+
celix_status_t fw_init(FRAMEWORK framework);
celix_status_t fw_installBundle(FRAMEWORK framework, BUNDLE * bundle, char * location);
+celix_status_t framework_getBundleEntry(FRAMEWORK framework, BUNDLE bundle, char *name, char **entry);
+
celix_status_t fw_startBundle(FRAMEWORK framework, BUNDLE bundle, int options);
-void fw_stopBundle(FRAMEWORK framework, BUNDLE bundle, int options);
+celix_status_t framework_updateBundle(FRAMEWORK framework, BUNDLE bundle, char *inputFile);
+void fw_stopBundle(FRAMEWORK framework, BUNDLE bundle, bool record);
celix_status_t fw_registerService(FRAMEWORK framework, SERVICE_REGISTRATION * registration, BUNDLE bundle, char * serviceName, void * svcObj, PROPERTIES properties);
void fw_unregisterService(SERVICE_REGISTRATION registration);
@@ -64,7 +69,7 @@ celix_status_t framework_markResolvedMod
ARRAY_LIST framework_getBundles();
-void framework_waitForStop();
+celix_status_t framework_waitForStop();
ARRAY_LIST framework_getBundles(FRAMEWORK framework);
BUNDLE framework_getBundle(FRAMEWORK framework, char * location);
Modified: incubator/celix/trunk/framework/private/include/headers.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/headers.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/headers.h (original)
+++ incubator/celix/trunk/framework/private/include/headers.h Tue May 10 08:21:24 2011
@@ -49,10 +49,8 @@
#define ATTRIBUTE_UNUSED
#endif
-//struct exception { int code; const char *msg; };
-//define_exception_type(struct exception);
-//extern struct exception_context the_exception_context[1];
+#define celix_log(msg) printf("%s\n\tat %s(%s:%d)\n", msg, __func__, __FILE__, __LINE__);
struct framework {
struct bundle * bundle;
@@ -93,11 +91,12 @@ typedef struct wire * WIRE;
struct bundle {
BUNDLE_CONTEXT context;
ACTIVATOR activator;
- long lastModified;
BUNDLE_STATE state;
void * handle;
BUNDLE_ARCHIVE archive;
- MODULE module;
+ // MODULE module;
+ ARRAY_LIST modules;
+ MANIFEST manifest;
pthread_mutex_t lock;
int lockCount;
Added: incubator/celix/trunk/framework/private/include/inputstream.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/inputstream.h?rev=1101360&view=auto
==============================================================================
--- incubator/celix/trunk/framework/private/include/inputstream.h (added)
+++ incubator/celix/trunk/framework/private/include/inputstream.h Tue May 10 08:21:24 2011
@@ -0,0 +1,18 @@
+/*
+ * inputstream.h
+ *
+ * Created on: Apr 13, 2011
+ * Author: alexanderb
+ */
+
+#ifndef INPUTSTREAM_H_
+#define INPUTSTREAM_H_
+
+#include "celix_errno.h"
+
+struct inputStream {
+ celix_status_t (*inputStream_read)(FILE *fp);
+};
+
+
+#endif /* INPUTSTREAM_H_ */
Propchange: incubator/celix/trunk/framework/private/include/inputstream.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/celix/trunk/framework/private/include/properties.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/properties.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/properties.h (original)
+++ incubator/celix/trunk/framework/private/include/properties.h Tue May 10 08:21:24 2011
@@ -31,6 +31,7 @@
typedef HASH_MAP PROPERTIES;
PROPERTIES properties_create(void);
+void properties_destroy(PROPERTIES properties);
PROPERTIES properties_load(char * filename);
void properties_store(PROPERTIES properties, char * file, char * header);
Modified: incubator/celix/trunk/framework/private/include/requirement.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/requirement.h?rev=1101360&r1=1101359&r2=1101360&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/requirement.h (original)
+++ incubator/celix/trunk/framework/private/include/requirement.h Tue May 10 08:21:24 2011
@@ -31,6 +31,7 @@
#include "headers.h"
REQUIREMENT requirement_create(HASH_MAP directives, HASH_MAP attributes);
+void requirement_destroy(REQUIREMENT requirement);
VERSION_RANGE requirement_getVersionRange(REQUIREMENT requirement);
char * requirement_getTargetName(REQUIREMENT requirement);