Author: abroekhuis
Date: Thu Nov 17 12:48:45 2011
New Revision: 1203175
URL: http://svn.apache.org/viewvc?rev=1203175&view=rev
Log:
Small updates
Modified:
incubator/celix/trunk/Hello World.launch
incubator/celix/trunk/Paint Example.launch
incubator/celix/trunk/examples/CMakeLists.txt
Modified: incubator/celix/trunk/Hello World.launch
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/Hello%20World.launch?rev=1203175&r1=1203174&r2=1203175&view=diff
==============================================================================
--- incubator/celix/trunk/Hello World.launch (original)
+++ incubator/celix/trunk/Hello World.launch Thu Nov 17 12:48:45 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="<?xml
version="1.0" encoding="UTF-8"
standalone="no"?><contentList><content
id="userData-userData-bundleActivator_stop-(cast)"
val="log_writer_t"/><content
id="userData-bundleActivator_stop-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-fw_startBundle-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-data-bundleActivator_start-(cast)"
val="log_writer_t"/><content
id="userData-*userData-userData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="*userData-userData-bundleActivator_create-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-userData-fw_startBundle-(cast)"
val="log_writer_t"/><content
id="key-hashMapIterator_remove-(cast)&qu
ot; val="char *"/><content
id="componentData-bundleActivator_create-(cast)"
val="log_writer_t"/></contentList>"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml
version="1.0" encoding="UTF-8"
standalone="no"?><contentList><content
id="componentData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="key-hashMapIterator_remove-(cast)" val="char
*"/><content id="userData-userData-fw_startBundle-(cast)"
val="log_writer_t"/><content
id="*userData-userData-bundleActivator_create-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-*userData-userData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="userData-data-bundleActivator_start-(cast)"
val="log_writer_t"/><content
id="userData-fw_startBundle-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-bundleActivator_stop-(cast)" val="DEPENDE
NCY_ACTIVATOR_BASE"/><content
id="userData-userData-bundleActivator_stop-(cast)"
val="log_writer_t"/></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"/>
Modified: incubator/celix/trunk/Paint Example.launch
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/Paint%20Example.launch?rev=1203175&r1=1203174&r2=1203175&view=diff
==============================================================================
--- incubator/celix/trunk/Paint Example.launch (original)
+++ incubator/celix/trunk/Paint Example.launch Thu Nov 17 12:48:45 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="<?xml
version="1.0" encoding="UTF-8"
standalone="no"?><contentList><content
id="userData-bundleActivator_stop-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="componentData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="key-hashMapIterator_remove-(cast)" val="char
*"/><content id="userData-userData-fw_startBundle-(cast)"
val="log_writer_t"/><content
id="*userData-userData-bundleActivator_create-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-*userData-userData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="userData-data-bundleActivator_start-(cast)"
val="log_writer_t"/><content
id="userData-fw_startBundle-(cast)" val="DEPENDE
NCY_ACTIVATOR_BASE"/><content
id="userData-userData-bundleActivator_stop-(cast)"
val="log_writer_t"/></contentList>"/>
+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml
version="1.0" encoding="UTF-8"
standalone="no"?><contentList><content
id="userData-userData-bundleActivator_stop-(cast)"
val="log_writer_t"/><content
id="userData-data-bundleActivator_start-(cast)"
val="log_writer_t"/><content
id="userData-*userData-userData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="*userData-userData-bundleActivator_create-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/><content
id="userData-userData-fw_startBundle-(cast)"
val="log_writer_t"/><content
id="key-hashMapIterator_remove-(cast)" val="char
*"/><content
id="componentData-bundleActivator_create-(cast)"
val="log_writer_t"/><content
id="userData-bundleActivator_stop-(cast)" val="DEPEN
DENCY_ACTIVATOR_BASE"/><content
id="userData-fw_startBundle-(cast)"
val="DEPENDENCY_ACTIVATOR_BASE"/></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"/>
Modified: incubator/celix/trunk/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/CMakeLists.txt?rev=1203175&r1=1203174&r2=1203175&view=diff
==============================================================================
--- incubator/celix/trunk/examples/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/CMakeLists.txt Thu Nov 17 12:48:45 2011
@@ -32,6 +32,6 @@ add_subdirectory(osgi-in-action/chapter0
add_subdirectory(osgi-in-action/chapter01-greeting-example)
add_subdirectory(osgi-in-action/chapter04-paint-example)
-deploy(chapter04-correct-listener BUNDLES shell shell_tui log_service
chapter04-correct-listener)
deploy(chapter01-greeting-example BUNDLES shell shell_tui log_service
chapter01-greeting-example-client chapter01-greeting-example)
+deploy(chapter04-correct-listener BUNDLES shell shell_tui log_service
chapter04-correct-listener)
deploy("chapter04-paint-example" BUNDLES chapter04-paint-example circle square
triangle shell shell_tui log_service log_writer)