Author: abroekhuis
Date: Mon Jul 2 13:57:00 2012
New Revision: 1356230
URL: http://svn.apache.org/viewvc?rev=1356230&view=rev
Log:
Removed unused file and some cleanup.
Removed:
incubator/celix/trunk/examples/remote/TestService.java
incubator/celix/trunk/examples/remote/test.service.proto
incubator/celix/trunk/examples/remote/test_service.h
incubator/celix/trunk/examples/target.cmake
Modified:
incubator/celix/trunk/Hello World.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=1356230&r1=1356229&r2=1356230&view=diff
==============================================================================
--- incubator/celix/trunk/Hello World.launch (original)
+++ incubator/celix/trunk/Hello World.launch Mon Jul 2 13:57:00 2012
@@ -35,7 +35,7 @@
<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="cdt.managedbuild.toolchain.gnu.macosx.base.1808592147"/>
-<stringAttribute key="org.eclipse.cdt.launch.WORKING_DIRECTORY"
value="${workspace_loc:celix/build/deploy/hello_world}"/>
+<stringAttribute key="org.eclipse.cdt.launch.WORKING_DIRECTORY"
value="${workspace_loc:celix/build/examples/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">
Modified: incubator/celix/trunk/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/CMakeLists.txt?rev=1356230&r1=1356229&r2=1356230&view=diff
==============================================================================
--- incubator/celix/trunk/examples/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/CMakeLists.txt Mon Jul 2 13:57:00 2012
@@ -23,8 +23,6 @@ if (EXAMPLES)
#add_subdirectory(receiver-2.0)
#add_subdirectory(sender)
- #add_subdirectory(echo_service/client)
- #add_subdirectory(echo_service/server)
add_subdirectory(whiteboard)
add_subdirectory(echo_service)
#add_subdirectory(component_testing)
@@ -37,5 +35,9 @@ if (EXAMPLES)
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)
- include(target.cmake)
+
+ deploy("hello_world" BUNDLES shell shell_tui hello_world log_service)
+ deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui
log_service log_writer)
+ deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell
shell_tui log_service log_writer)
+ deploy("echo" BUNDLES echo_server echo_client shell shell_tui log_service
log_writer)
endif(EXAMPLES)