framework.h

abroekhuis Tue, 19 Jul 2011 05:33:14 -0700

Author: abroekhuis
Date: Tue Jul 19 12:32:48 2011
New Revision: 1148299

URL: http://svn.apache.org/viewvc?rev=1148299&view=rev
Log:
Fixed bugs after code cleanup


Modified:
    incubator/celix/trunk/Hello World.launch
    incubator/celix/trunk/dependency_manager/dependency_activator_base.h
    incubator/celix/trunk/framework/private/include/framework.h

Modified: incubator/celix/trunk/Hello World.launch
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/Hello%20World.launch?rev=1148299&r1=1148298&r2=1148299&view=diff
==============================================================================
--- incubator/celix/trunk/Hello World.launch (original)
+++ incubator/celix/trunk/Hello World.launch Tue Jul 19 12:32:48 2011
@@ -29,7 +29,7 @@
 <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="&lt;?xml 
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; 
standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content 
id=&quot;componentData-bundleActivator_create-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;key-hashMapIterator_remove-(cast)&quot; val=&quot;char 
*&quot;/&gt;&lt;content id=&quot;userData-userData-fw_startBundle-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;*userData-userData-bundleActivator_create-(cast)&quot; 
val=&quot;DEPENDENCY_ACTIVATOR_BASE&quot;/&gt;&lt;content 
id=&quot;userData-*userData-userData-bundleActivator_create-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;userData-data-bundleActivator_start-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;userData-fw_startBundle-(cast)&quot; 
val=&quot;DEPENDENCY_ACTIVATOR_BASE&quot;/&gt;&lt;content 
id=&quot;userData-bundleActivator_stop-(cast)&quot; val=&quot;DEPENDE
 NCY_ACTIVATOR_BASE&quot;/&gt;&lt;content 
id=&quot;userData-userData-bundleActivator_stop-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;/contentList&gt;"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml 
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; 
standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content 
id=&quot;userData-userData-bundleActivator_stop-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;userData-bundleActivator_stop-(cast)&quot; 
val=&quot;DEPENDENCY_ACTIVATOR_BASE&quot;/&gt;&lt;content 
id=&quot;userData-fw_startBundle-(cast)&quot; 
val=&quot;DEPENDENCY_ACTIVATOR_BASE&quot;/&gt;&lt;content 
id=&quot;userData-data-bundleActivator_start-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;userData-*userData-userData-bundleActivator_create-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;*userData-userData-bundleActivator_create-(cast)&quot; 
val=&quot;DEPENDENCY_ACTIVATOR_BASE&quot;/&gt;&lt;content 
id=&quot;userData-userData-fw_startBundle-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;content 
id=&quot;key-hashMapIterator_remove-(cast)&qu
 ot; val=&quot;char *&quot;/&gt;&lt;content 
id=&quot;componentData-bundleActivator_create-(cast)&quot; 
val=&quot;log_writer_t&quot;/&gt;&lt;/contentList&gt;"/>
 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml 
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; 
standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml 
version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; 
standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList/&gt;&#10;"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" 
value="build/launcher/launcher"/>

Modified: incubator/celix/trunk/dependency_manager/dependency_activator_base.h
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/dependency_activator_base.h?rev=1148299&r1=1148298&r2=1148299&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_activator_base.h 
(original)
+++ incubator/celix/trunk/dependency_manager/dependency_activator_base.h Tue 
Jul 19 12:32:48 2011
@@ -34,7 +34,7 @@ void * dm_create(BUNDLE_CONTEXT context)
 void dm_init(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER 
manager);
 void dm_destroy(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER 
manager);
 
-SERVICE dependencyActivatorBase_createService(void);
+SERVICE dependencyActivatorBase_createService(DEPENDENCY_MANAGER manager);
 SERVICE_DEPENDENCY 
dependencyActivatorBase_createServiceDependency(DEPENDENCY_MANAGER manager);
 
 #endif /* DEPENDENCY_ACTIVATOR_BASE_H_ */

Modified: incubator/celix/trunk/framework/private/include/framework.h
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/framework.h?rev=1148299&r1=1148298&r2=1148299&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/framework.h (original)
+++ incubator/celix/trunk/framework/private/include/framework.h Tue Jul 19 
12:32:48 2011
@@ -72,9 +72,7 @@ SERVICE_REGISTRATION findRegistration(SE
 SERVICE_REFERENCE listToArray(ARRAY_LIST list);
 celix_status_t framework_markResolvedModules(FRAMEWORK framework, HASH_MAP 
wires);
 
-ARRAY_LIST framework_getBundles(void);
-
-celix_status_t framework_waitForStop(void);
+celix_status_t framework_waitForStop(FRAMEWORK framework);
 
 ARRAY_LIST framework_getBundles(FRAMEWORK framework);
 BUNDLE framework_getBundle(FRAMEWORK framework, char * location);

svn commit: r1148299 - in /incubator/celix/trunk: Hello World.launch dependency_manager/dependency_activator_base.h framework/private/include/framework.h

Reply via email to