From 663d2318e9f7670dd6caee870c2a999fcf9ced0b Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Tue, 18 Apr 2006 21:28:05 +0000 Subject: *** empty log message *** --- .../examples/BasicSP/BMClosedED/BMClosedED.mpc | 19 ++--- TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc | 5 +- .../examples/BasicSP/BMDevice/BMDevice_exec.cpp | 18 ++--- TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc | 19 ++--- .../examples/BasicSP/BMDisplay/BMDisplay_exec.cpp | 8 +-- TAO/CIAO/examples/BasicSP/BasicSP.mpc | 2 +- TAO/CIAO/examples/BasicSP/EC/EC.mpc | 19 +++-- TAO/CIAO/examples/BasicSP/EC/controller.cpp | 14 ++-- TAO/CIAO/examples/BasicSP/README.html | 16 ++--- .../BasicSP/descriptors/NodeManagerMap.dat | 2 +- .../BasicSP/descriptors/basicNodeDaemon.pl | 4 +- .../descriptors/flattened_deploymentplan.cdp | 60 ++++++++-------- TAO/CIAO/examples/Display/GPS/GPS.mpc | 9 ++- TAO/CIAO/examples/Display/HUDisplay.mpc | 2 +- .../examples/Display/NavDisplay/NavDisplay.mpc | 7 +- .../Display/NavDisplayGUI_exec/NavDisplayGUI.mpc | 2 +- .../Display/NavDisplayGUI_exec/trolltech.gif | Bin 42627 -> 42629 bytes .../Display/NavDisplayGUI_exec/worldmap1.gif | Bin 207576 -> 207612 bytes TAO/CIAO/examples/Display/README.html | 2 +- TAO/CIAO/examples/Display/RateGen/RateGen.mpc | 24 ++++--- TAO/CIAO/examples/Display/descriptors/RateGen.ior | 2 +- .../Display/descriptors/basicNodeDaemon.pl | 4 +- .../descriptors/flattened_deploymentplan.cdp | 80 ++++++++++----------- TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc | 2 +- TAO/CIAO/examples/Hello/ReDaC-Usage.html | 28 ++++---- TAO/CIAO/examples/Hello/Receiver/Receiver.mpc | 17 +++-- TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp | 2 +- TAO/CIAO/examples/Hello/Sender/Sender.idl | 8 +-- TAO/CIAO/examples/Hello/Sender/Sender.mpc | 20 +++--- TAO/CIAO/examples/Hello/Sender/Sender_exec.h | 2 +- TAO/CIAO/examples/Hello/Sender/starter.cpp | 26 +++---- TAO/CIAO/examples/Hello/descriptors/Hello.cid | 16 ++--- .../Hello/descriptors/flattened_deploymentplan.cdp | 18 ++--- .../flattened_deploymentplan_without_ns.cdp | 16 ++--- TAO/CIAO/examples/Hello/descriptors/run_test.pl | 14 ++-- .../Hello/descriptors/run_test_without_ns.pl | 8 +-- .../examples/Hello/descriptors_RTCCM/input.csr | 20 +++--- .../Hello/descriptors_RTCCM/rt-config-example.cdp | 6 +- .../Hello/descriptors_RTCCM/rt-config-example.csr | 14 ++-- .../Hello/descriptors_RTCCM/rt-example.cdp | 16 ++--- .../Hello/descriptors_RTCCM/rt_run_test.pl | 8 +-- .../Hello/descriptors_ReDaC/deploymentplan.cdp | 16 ++--- .../Hello/descriptors_ReDaC/deploymentplan_add.cdp | 16 ++--- .../descriptors_ReDaC/deploymentplan_remove.cdp | 16 ++--- .../descriptors_naming/deploymentplan_naming.cdp | 18 ++--- .../deploymentplan.cdp | 18 ++--- .../deploymentplan_shared_components.cdp | 24 +++---- TAO/CIAO/examples/Hello/step-by-step.html | 24 +++---- TAO/CIAO/examples/Philosophers/README | 2 +- .../examples/Swapping/Hello_Base/Hello_Base.mpc | 2 +- TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc | 17 +++-- .../examples/Swapping/Receiver/Receiver_exec.cpp | 10 +-- .../examples/Swapping/Receiver/Receiver_exec.h | 10 +-- TAO/CIAO/examples/Swapping/Sender/Sender.idl | 2 +- TAO/CIAO/examples/Swapping/Sender/Sender.mpc | 30 ++++---- TAO/CIAO/examples/Swapping/Sender/starter.cpp | 22 +++--- 56 files changed, 413 insertions(+), 373 deletions(-) diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc index c676d5b7f66..7eaa7d913a4 100644 --- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc +++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc @@ -2,13 +2,14 @@ // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i BMClosedED" // This file has been manually modified to add a second component implementation. -project(BMClosedED_DnC_stub): ciao_client_dnc { +project(BMClosedED_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += BasicSP_DnC_stub sharedname = BMClosedED_stub - idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export - idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h - idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export + idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export + idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h + idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h libs += BasicSP_stub @@ -25,16 +26,17 @@ project(BMClosedED_DnC_stub): ciao_client_dnc { } project(BMClosedED_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += BasicSP_DnC_svnt BMClosedED_DnC_stub sharedname = BMClosedED_svnt - libs += BMClosedED_stub BasicSP_stub + libs += BMClosedED_stub BasicSP_stub libs += BasicSP_svnt libpaths += .. - idlflags += -Wb,export_macro=BMCLOSEDED_SVNT_Export + idlflags += -Wb,export_macro=BMCLOSEDED_SVNT_Export idlflags += -Wb,export_include=BMClosedED_svnt_export.h dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL @@ -56,15 +58,16 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc { project(BMClosedED_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += BMClosedED_DnC_svnt sharedname = BMClosedED_exec - libs += BMClosedED_stub BMClosedED_svnt + libs += BMClosedED_stub BMClosedED_svnt libs += BasicSP_stub BasicSP_svnt libpaths += .. - idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export + idlflags += -Wb,export_macro=BMCLOSEDED_EXEC_Export idlflags += -Wb,export_include=BMClosedED_exec_export.h dynamicflags = BMCLOSEDED_EXEC_BUILD_DLL diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc index a58ba4a18fe..762fb25c8e8 100644 --- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc +++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc @@ -1,6 +1,7 @@ // $Id$ -project(BMDevice_DnC_stub): ciao_client_dnc { +project(BMDevice_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += BasicSP_DnC_stub sharedname = BMDevice_stub @@ -19,6 +20,7 @@ project(BMDevice_DnC_stub): ciao_client_dnc { } project(BMDevice_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += BMDevice_DnC_stub BasicSP_DnC_stub sharedname = BMDevice_svnt libs += BMDevice_stub BasicSP_stub BasicSP_svnt @@ -43,6 +45,7 @@ project(BMDevice_DnC_svnt) : ciao_servant_dnc { project(BMDevice_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += BMDevice_DnC_svnt sharedname = BMDevice_exec libs += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp index a4c783f882d..089ea646f76 100644 --- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp +++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp @@ -59,15 +59,15 @@ MyImpl::BMDevice_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL) // Operations from Components::SessionComponent void MyImpl::BMDevice_exec_i::set_session_context ( - Components::SessionContext_ptr ctx - ACE_ENV_ARG_DECL - ) + Components::SessionContext_ptr ctx + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)) { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::set_session_context\n")); } @@ -97,10 +97,10 @@ MyImpl::BMDevice_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_activate\n")); } - + } void @@ -117,7 +117,7 @@ MyImpl::BMDevice_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_passivate\n")); } } @@ -129,7 +129,7 @@ MyImpl::BMDevice_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_remove\n")); } } @@ -156,7 +156,7 @@ MyImpl::BMDeviceHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL) Components::EnterpriseComponent_ptr tmp= 0; ACE_NEW_THROW_EX (tmp, MyImpl::BMDevice_exec_i, - CORBA::NO_MEMORY ()); + CORBA::NO_MEMORY ()); return tmp; } diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc index d73f69ce65e..740c50abf8e 100644 --- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc +++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc @@ -1,17 +1,18 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay" -project(BMDisplay_DnC_stub): ciao_client_dnc { +project(BMDisplay_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += BasicSP_DnC_stub sharedname = BMDisplay_stub - idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export - idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h - idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export + idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export + idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h + idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h dynamicflags = BMDISPLAY_STUB_BUILD_DLL - + libs += BasicSP_stub IDL_Files { @@ -24,6 +25,7 @@ project(BMDisplay_DnC_stub): ciao_client_dnc { } project(BMDisplay_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += BasicSP_DnC_svnt BMDisplay_DnC_stub sharedname = BMDisplay_svnt @@ -32,7 +34,7 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc { libpaths += .. - idlflags += -Wb,export_macro=BMDISPLAY_SVNT_Export + idlflags += -Wb,export_macro=BMDISPLAY_SVNT_Export idlflags += -Wb,export_include=BMDisplay_svnt_export.h dynamicflags = BMDISPLAY_SVNT_BUILD_DLL @@ -54,16 +56,17 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc { project(BMDisplay_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += BMDisplay_DnC_svnt sharedname = BMDisplay_exec - libs += BMDisplay_stub BMDisplay_svnt + libs += BMDisplay_stub BMDisplay_svnt libs += BasicSP_stub BasicSP_svnt libpaths += .. - idlflags += -Wb,export_macro=BMDISPLAY_EXEC_Export + idlflags += -Wb,export_macro=BMDISPLAY_EXEC_Export idlflags += -Wb,export_include=BMDisplay_exec_export.h dynamicflags = BMDISPLAY_EXEC_BUILD_DLL diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp index 6b075cf9c5c..f0fc61007d7 100644 --- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp +++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp @@ -62,7 +62,7 @@ MyImpl::BMDisplay_exec_impl::set_session_context ( { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::set_session_context\n")); } @@ -92,7 +92,7 @@ MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_activate\n")); } @@ -116,7 +116,7 @@ MyImpl::BMDisplay_exec_impl::ccm_passivate ( { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_passivate\n")); } } @@ -128,7 +128,7 @@ MyImpl::BMDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { if (CIAO::debug_level () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_remove\n")); } } diff --git a/TAO/CIAO/examples/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/BasicSP/BasicSP.mpc index 20f682a413b..fd1151988cf 100644 --- a/TAO/CIAO/examples/BasicSP/BasicSP.mpc +++ b/TAO/CIAO/examples/BasicSP/BasicSP.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n HUDisplay" -project(BasicSP_DnC_stub): ciao_client_dnc { +project(BasicSP_DnC_stub): ciao_events_base_dnc { sharedname = BasicSP_stub idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc index 381afbe454f..d425aad92e3 100644 --- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc +++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc @@ -1,14 +1,15 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC" -project(EC_DnC_stub): ciao_client_dnc { +project(EC_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += BasicSP_DnC_stub sharedname = EC_stub - idlflags += -Wb,stub_export_macro=EC_STUB_Export - idlflags += -Wb,stub_export_include=EC_stub_export.h - idlflags += -Wb,skel_export_macro=EC_SVNT_Export + idlflags += -Wb,stub_export_macro=EC_STUB_Export + idlflags += -Wb,stub_export_include=EC_stub_export.h + idlflags += -Wb,skel_export_macro=EC_SVNT_Export idlflags += -Wb,skel_export_include=EC_svnt_export.h dynamicflags = EC_STUB_BUILD_DLL @@ -25,12 +26,13 @@ project(EC_DnC_stub): ciao_client_dnc { } project(EC_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += BasicSP_DnC_svnt EC_DnC_stub sharedname = EC_svnt libpaths += .. - idlflags += -Wb,export_macro=EC_SVNT_Export + idlflags += -Wb,export_macro=EC_SVNT_Export idlflags += -Wb,export_include=EC_svnt_export.h dynamicflags = EC_SVNT_BUILD_DLL @@ -54,6 +56,7 @@ project(EC_DnC_svnt) : ciao_servant_dnc { project(EC_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += EC_DnC_svnt sharedname = EC_exec @@ -61,7 +64,7 @@ project(EC_DnC_exec) : ciao_component_dnc { libpaths += .. - idlflags += -Wb,export_macro=EC_EXEC_Export + idlflags += -Wb,export_macro=EC_EXEC_Export idlflags += -Wb,export_include=EC_exec_export.h dynamicflags = EC_EXEC_BUILD_DLL @@ -79,6 +82,7 @@ project(EC_DnC_exec) : ciao_component_dnc { project (EC_DnC_client) : ciao_client_dnc, valuetype { + avoids += ace_for_tao exename = client after += EC_DnC_stub libs += EC_stub BasicSP_stub @@ -93,7 +97,8 @@ project (EC_DnC_client) : ciao_client_dnc, valuetype { } -project (EC_DnC_controller) : ciao_client_dnc, valuetype { +project (EC_DnC_controller) : ciao_events_dnc, valuetype { + avoids += ace_for_tao exename = controller after += EC_DnC_stub libs += EC_stub BasicSP_stub diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp index d385ad186d1..d52ac54dba9 100644 --- a/TAO/CIAO/examples/BasicSP/EC/controller.cpp +++ b/TAO/CIAO/examples/BasicSP/EC/controller.cpp @@ -38,8 +38,8 @@ parse_args (int argc, char *argv[]) break; case 'r': - rate = atoi (get_opts.opt_arg ()); - break; + rate = atoi (get_opts.opt_arg ()); + break; case '?': // display help for use of the server. default: @@ -75,10 +75,10 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, + argv, + "" + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -98,7 +98,7 @@ main (int argc, char *argv[]) if (CORBA::is_nil (pulser.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire 'EC' objref\n"), -1); } diff --git a/TAO/CIAO/examples/BasicSP/README.html b/TAO/CIAO/examples/BasicSP/README.html index c9ce1dfd2e3..00c785c7c2f 100644 --- a/TAO/CIAO/examples/BasicSP/README.html +++ b/TAO/CIAO/examples/BasicSP/README.html @@ -18,21 +18,21 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with Copy the file into the $CIAO_ROOT/bin directory. Build ACE, TAO, DAnCE before you proceed. - +

NOTE:
While buiding DAnCE, we also suggest that you build the tests in the $CIAO_ROOT/test directory and make sure all the tests run OK before you proceed to try out the BasicSP example or any other DAnCE-based applications. To do this, open the file - - $ACE_ROOT/bin/MakeProjectCreator/config/global.features, - + + $ACE_ROOT/bin/MakeProjectCreator/config/global.features, + then change the line from "cidl = 0" to "cidl = 1".

- + After this, go back to the $CIAO_ROOT/DAnCE directory to generate your workspace/project or makefile by using MPC.
After the DAnCE and the tests are build OK, go to the $CIAO_ROOT/DAnCE/tests/NodeApplicationTest directory and make sure all the three perl scripts (run_test.pl, run_test_simple.pl and run_test_ex.pl) run successfully. - +

@@ -52,14 +52,14 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with