diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-04-18 21:28:05 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-04-18 21:28:05 +0000 |
| commit | 663d2318e9f7670dd6caee870c2a999fcf9ced0b (patch) | |
| tree | 4bf618c2c4c9e82db3753773bbfc8c3fa046d189 | |
| parent | cd41ffae541ead6049d1282a5a9ae1ad1a31c3ee (diff) | |
| download | ATCD-663d2318e9f7670dd6caee870c2a999fcf9ced0b.tar.gz | |
*** empty log message ***
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 <code> $CIAO_ROOT/bin </code> directory. Build ACE, TAO, DAnCE before you proceed. - + <br><br> <em>NOTE</em>: <br> 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". <br><br> - + After this, go back to the $CIAO_ROOT/DAnCE directory to generate your workspace/project or makefile by using MPC.<br> 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. - + <br><br> </LI> @@ -52,14 +52,14 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with <UL> <LI> Change into the $CIAO_ROOT/DAnCE/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code> - + <LI> Start the execution manager: <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code> </LI> <LI> Start the executor: <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattern_deploymentplan.cdp -k file://EM.ior </code> - + <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/DAnCE/examples/BasicSP/EC/controller to start the application. Please make sure that the component IOR file for the EC component is present when you run this client. diff --git a/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat b/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat index 9ad8b55bacb..6f4bbd25734 100644 --- a/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat +++ b/TAO/CIAO/examples/BasicSP/descriptors/NodeManagerMap.dat @@ -1,2 +1,2 @@ AirFrameDevice corbaloc:iiop:localhost:10000/NodeManager -TimerDevice corbaloc:iiop:localhost:20000/NodeManager +TimerDevice corbaloc:iiop:localhost:20000/NodeManager
\ No newline at end of file diff --git a/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl b/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl index 7c4dc98c25d..582b0b95358 100755 --- a/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl +++ b/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl @@ -45,9 +45,9 @@ $SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager", $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager", "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); - + $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager", - "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); $SV1->Spawn (); $SV2->Spawn (); $SV3->Spawn (); diff --git a/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp index fdeb12c4da8..d3aa1197327 100644 --- a/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp +++ b/TAO/CIAO/examples/BasicSP/descriptors/flattened_deploymentplan.cdp @@ -6,13 +6,13 @@ <label>BasicSP-DeploymentPlan</label> <UUID>Test_UUID_0000</UUID> - <!-- Exactly one realizes + <!-- Exactly one realizes This realizes section may also not be right. --> <realizes> <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>timeout</name> <specificType>IDL:BasicSP/TimeOut:1.0</specificType> @@ -24,7 +24,7 @@ <kind>EventConsumer</kind> </port> </realizes> - + <implementation id="BasicSP-BMClosedED-mdd"> <name>BasicSP-BMClosedED-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -40,7 +40,7 @@ <implementation id="BasicSP-BMDevice-mdd"> <name>BasicSP-BMDevice-mdd</name> <source><!-- @@ Don't know what goes here --></source> - + <artifact>BasicSP-BMDevice_exec</artifact> <artifact>BasicSP-BMDevice_stub</artifact> <artifact>BasicSP-BMDevice_svnt</artifact> @@ -49,28 +49,28 @@ <deployRequirement></deployRequirement> --> </implementation> - + <implementation id="BasicSP-BMDisplay-mdd"> <name>BasicSP-BMDisplay-mdd</name> <source><!-- @@ Don't know what goes here --></source> <artifact>BasicSP-BMDisplay_exec</artifact> <artifact>BasicSP-BMDisplay_svnt</artifact> <artifact>BasicSP-BMDisplay_stub</artifact> - + <!-- <execParameter></execParameter> <deployRequirement></deployRequirement> --> </implementation> - + <implementation id="BasicSP-EC-mdd"> <name>BasicSP-EC-mdd</name> <source><!-- @@ Don't know what goes here --></source> - + <artifact>BasicSP-EC_stub</artifact> <artifact>BasicSP-EC_svnt</artifact> <artifact>BasicSP-EC_exec</artifact> - + <!-- <execParameter></execParameter> <deployRequirement></deployRequirement> @@ -103,7 +103,7 @@ <value> <string>AirFrameDevice_001</string> </value> - </value> + </value> </configProperty> </instance> @@ -124,7 +124,7 @@ </value> </configProperty> </instance> - + <instance id="BasicSP-BMDisplay-idd"> <name>BasicSP-BMDisplay-idd</name> <node>AirFrameDevice</node> @@ -142,7 +142,7 @@ </value> </configProperty> </instance> - + <instance id="BasicSP-EC-idd"> <name>BasicSP-EC-idd</name> <node>TimerDevice</node> @@ -159,7 +159,7 @@ </value> </value> </configProperty> - </instance> + </instance> <connection> <name>datain_data_read</name> @@ -247,10 +247,10 @@ </value> </value> </execParameter> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMClosedED_svnt"> <name>BMClosedED_svnt</name> <source><!-- @@ Not sure --></source> @@ -269,16 +269,16 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMClosedED_stub"> <name>BMClosedED_stub</name> <source><!-- @@ Not sure --></source> <node><!-- blank --></node> <location>BMClosedED_stub</location> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMDevice_exec"> <name>BMDevice_exec</name> <source><!-- @@ Not sure --></source> @@ -297,7 +297,7 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMDevice_stub"> <name>BMDevice_stub</name> <source><!-- @@ Not sure --></source> @@ -305,7 +305,7 @@ <location>BMDevice_stub</location> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMDevice_svnt"> <name>BMDevice_svnt</name> <source><!-- @@ Not sure --></source> @@ -324,7 +324,7 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMDisplay_exec"> <name>BMDisplay_exec</name> <source><!-- @@ Not sure --></source> @@ -343,7 +343,7 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMDisplay_svnt"> <name>BMDisplay_svnt</name> <source><!-- @@ Not sure --></source> @@ -362,25 +362,25 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-BMDisplay_stub"> <name>BMDisplay_stub</name> <source><!-- @@ Not sure --></source> <node><!-- blank --></node> <location>BMDisplay_stub</location> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-EC_stub"> <name>EC_stub</name> <source><!-- @@ Not sure --></source> <node><!-- blank --></node> <location>EC_stub</location> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-EC_svnt"> <name>EC_svnt</name> <source><!-- @@ Not sure --></source> @@ -399,7 +399,7 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="BasicSP-EC_exec"> <name>EC_exec</name> <source><!-- @@ Not sure --></source> @@ -416,7 +416,7 @@ </value> </value> </execParameter> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc index 323b0aeb053..b72c8b64f97 100644 --- a/TAO/CIAO/examples/Display/GPS/GPS.mpc +++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc @@ -1,14 +1,15 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p HUDisplay GPS" -project(GPS_DnC_stub): ciao_client_dnc { +project(GPS_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += HUDisplay_DnC_stub sharedname = GPS_DnC_stub idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h libpaths+=.. libs += HUDisplay_DnC_stub dynamicflags = GPS_STUB_BUILD_DLL - + IDL_Files { GPS.idl } @@ -19,6 +20,7 @@ project(GPS_DnC_stub): ciao_client_dnc { } project(GPS_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += GPS_DnC_svnt GPS_DnC_stub HUDisplay_DnC_svnt sharedname = GPS_DnC_svnt libs += GPS_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt @@ -43,6 +45,7 @@ project(GPS_DnC_svnt) : ciao_servant_dnc { project(GPS_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += GPS_DnC_svnt sharedname = GPS_DnC_exec libs += GPS_DnC_stub GPS_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt @@ -55,7 +58,7 @@ project(GPS_DnC_exec) : ciao_component_dnc { } Source_Files { - + GPSEIC.cpp GPS_exec.cpp diff --git a/TAO/CIAO/examples/Display/HUDisplay.mpc b/TAO/CIAO/examples/Display/HUDisplay.mpc index 1290bde29a3..41e3dbc1ab1 100644 --- a/TAO/CIAO/examples/Display/HUDisplay.mpc +++ b/TAO/CIAO/examples/Display/HUDisplay.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n HUDisplay" -project(HUDisplay_DnC_stub): ciao_client_dnc { +project(HUDisplay_DnC_stub): ciao_events_base_dnc { sharedname = HUDisplay_DnC_stub idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc index 12505060fdb..3addb40ebee 100644 --- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc +++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc @@ -1,7 +1,8 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p HUDisplay NavDisplay" -project(NavDisplay_DnC_stub): ciao_client_dnc { +project(NavDisplay_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += HUDisplay_DnC_stub sharedname = NavDisplay_DnC_stub idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h @@ -17,10 +18,11 @@ project(NavDisplay_DnC_stub): ciao_client_dnc { } project(NavDisplay_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += HUDisplay_DnC_svnt NavDisplay_DnC_stub sharedname = NavDisplay_DnC_svnt libs += NavDisplay_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt - + idlflags += -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL @@ -41,6 +43,7 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc { project(NavDisplay_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += NavDisplay_DnC_svnt sharedname = NavDisplay_DnC_exec libs += NavDisplay_DnC_stub NavDisplay_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc index 7a5a4e78902..5c12e09bb09 100644 --- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc +++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc @@ -1,5 +1,5 @@ // $Id$ -project(NavDisplayGUI_DnC_exec) : ciao_component_dnc, qt { +project(NavDisplayGUI_DnC_exec) : ciao_events_base_dnc, qt { after += NavDisplay_DnC_exec requires += qt sharedname = NavDisplayGUI_DnC_exec diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif Binary files differindex 66da94fb44c..f674369efc4 100644 --- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif +++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif Binary files differindex efaf4c37e90..99fe78a7673 100644 --- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif +++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/worldmap1.gif diff --git a/TAO/CIAO/examples/Display/README.html b/TAO/CIAO/examples/Display/README.html index 8bc7ee110bb..3f6958893db 100644 --- a/TAO/CIAO/examples/Display/README.html +++ b/TAO/CIAO/examples/Display/README.html @@ -53,7 +53,7 @@ the following three components: <li>1. The interfaces, -data types and exceptions used by the components of this application are +data types and exceptions used by the components of this application are specified in the <a href="HUDisplay.idl"> <code> HUDisplay.idl</code></a> file, placed in this example root directory ($CIAO_ROOT/examples/Display). diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc index 2ce4b9f6aa0..e0cd424393e 100644 --- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc +++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc @@ -1,7 +1,8 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -p HUDisplay RateGen" -project(RateGen_DnC_stub): ciao_client_dnc { +project(RateGen_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += HUDisplay_DnC_stub sharedname = RateGen_DnC_stub idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h @@ -17,6 +18,7 @@ project(RateGen_DnC_stub): ciao_client_dnc { } project(RateGen_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += HUDisplay_DnC_svnt RateGen_DnC_stub sharedname = RateGen_DnC_svnt libs += RateGen_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt @@ -41,6 +43,7 @@ project(RateGen_DnC_svnt) : ciao_servant_dnc { project(RateGen_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += RateGen_DnC_svnt sharedname = RateGen_DnC_exec libs += RateGen_DnC_stub RateGen_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt @@ -60,18 +63,19 @@ project(RateGen_DnC_exec) : ciao_component_dnc { - project (RateGen_DnC_controller) : ciao_client_dnc, valuetype { - exename = controller - after += RateGen_DnC_stub - libs += RateGen_DnC_stub HUDisplay_DnC_stub - libpaths += .. +project (RateGen_DnC_controller) : ciao_client_dnc, valuetype { + avoids += ace_for_tao + exename = controller + after += RateGen_DnC_stub + libs += RateGen_DnC_stub HUDisplay_DnC_stub + libpaths += .. - IDL_Files { - } + IDL_Files { + } Source_Files { - controller.cpp - } + controller.cpp + } } diff --git a/TAO/CIAO/examples/Display/descriptors/RateGen.ior b/TAO/CIAO/examples/Display/descriptors/RateGen.ior index e589de21d27..60326a12b43 100644 --- a/TAO/CIAO/examples/Display/descriptors/RateGen.ior +++ b/TAO/CIAO/examples/Display/descriptors/RateGen.ior @@ -1 +1 @@ -IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000 +IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file diff --git a/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl index a3dc38609e7..da93ff1c72d 100755 --- a/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl +++ b/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl @@ -45,9 +45,9 @@ $SV3 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager", $SV4 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager", "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); - + $SV5 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager", - "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); $SV1->Spawn (); $SV2->Spawn (); $SV3->Spawn (); diff --git a/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp index c92a18ffb0c..ddfd9a3ca37 100644 --- a/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp +++ b/TAO/CIAO/examples/Display/descriptors/flattened_deploymentplan.cdp @@ -6,13 +6,13 @@ <label>Display-DeploymentPlan</label> <UUID><!-- @@ fill in --> </UUID> - <!-- Exactly one realizes + <!-- Exactly one realizes This realizes section may also not be right. --> <realizes> <label>HUDisplay-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:HUDisplay/RateGen:1.0</supportedType> + <supportedType>IDL:HUDisplay/RateGen:1.0</supportedType> <port> <name>Pulse</name> <specificType>IDL:HUDisplay/TimeOut:1.0</specificType> @@ -24,21 +24,21 @@ <kind>EventPublisher</kind> </port> </realizes> - + <implementation id="HUDisplay-RateGen-mdd"> <name>HUDisplay-RateGen-mdd</name> <source><!-- @@ Don't know what goes here --></source> - + <artifact>HUDisplay-RateGen_stub</artifact> <artifact>HUDisplay-RateGen_svnt</artifact> <artifact>HUDisplay-RateGen_exec</artifact> - + <!-- <execParameter></execParameter> <deployRequirement></deployRequirement> --> </implementation> - + <implementation id="HUDisplay-GPS-mdd"> <name>HUDisplay-GPS-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -51,22 +51,22 @@ --> </implementation> - - - + + + <implementation id="HUDisplay-NavDisplayGUI-mdd"> <name>HUDisplay-NavDisplayGUI-mdd</name> <source><!-- @@ Don't know what goes here --></source> <artifact>HUDisplay-NavDisplay_stub</artifact> <artifact>HUDisplay-NavDisplay_svnt</artifact> <artifact>HUDisplay-NavDisplayGUI_exec</artifact> - + <!-- <execParameter></execParameter> <deployRequirement></deployRequirement> --> </implementation> - + <instance id="HUDisplay-RateGen-idd"> <name>HUDisplay-RateGen-idd</name> <node>AirFrameDevice</node> @@ -83,7 +83,7 @@ </value> </value> </configProperty> - </instance> + </instance> <instance id="HUDisplay-GPS-idd"> <name>HUDisplay-GPS-idd</name> @@ -103,10 +103,10 @@ </configProperty> </instance> + + - - - + <instance id="HUDisplay-NavDisplayGUI-idd"> <name>HUDisplay-NavDisplayGUI-idd</name> <node>AirFrameDevice</node> @@ -140,7 +140,7 @@ </internalEndpoint> </connection> - + <connection> <name>Refresh_Ready</name> @@ -169,16 +169,16 @@ <instance>HUDisplay-GPS-idd</instance> </internalEndpoint> </connection> - + <artifact id="HUDisplay-RateGen_stub"> <name>RateGen_stub</name> <source><!-- @@ Not sure --></source> <node><!-- blank --></node> <location>RateGen_stub</location> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="HUDisplay-RateGen_svnt"> <name>RateGen_DnC_svnt</name> <source><!-- @@ Not sure --></source> @@ -197,7 +197,7 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="HUDisplay-RateGen_exec"> <name>RateGen_DnC_exec</name> <source><!-- @@ Not sure --></source> @@ -214,19 +214,19 @@ </value> </value> </execParameter> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="HUDisplay-GPS_stub"> <name>GPS_DnC_stub</name> <source><!-- @@ Not sure --></source> <node><!-- blank --></node> <location>GPS_DnC_stub</location> - + <!-- @@ This has dependancies that need to be specified, how? --> - </artifact> - + </artifact> + <artifact id="HUDisplay-GPS_svnt"> <name>GPS_DnC_svnt</name> <source><!-- @@ Not sure --></source> @@ -245,8 +245,8 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - - + + <artifact id="HUDisplay-GPS_exec"> <name>GPS_DnC_exec</name> <source><!-- @@ Not sure about this--></source> @@ -263,21 +263,21 @@ </value> </value> </execParameter> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - - + + <artifact id="HUDisplay-NavDisplay_stub"> <name>NavDisplay_DnC_stub</name> <source><!-- @@ Not sure --></source> <node><!-- blank --></node> <location>NavDisplay_DnC_stub</location> - + <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - + <artifact id="HUDisplay-NavDisplay_svnt"> <name>NavDisplay_DnC_svnt</name> <source><!-- @@ Not sure --></source> @@ -296,11 +296,11 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> + - - - - + + + <artifact id="HUDisplay-NavDisplayGUI_exec"> <name>NavDisplayGUI_DnC_exec</name> <source><!-- @@ Not sure --></source> @@ -319,7 +319,7 @@ </execParameter> <!-- @@ This has dependancies that need to be specified, how? --> </artifact> - - - -</Deployment:deploymentPlan> + + + +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc index 4bfcf5bcd20..e637d031bd9 100644 --- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Hello_Base" -project(Hello_Base_DnC_stub): ciao_client_dnc { +project(Hello_Base_DnC_stub): ciao_events_base_dnc { sharedname = Hello_Base_DnC_stub idlflags += -Sc \ diff --git a/TAO/CIAO/examples/Hello/ReDaC-Usage.html b/TAO/CIAO/examples/Hello/ReDaC-Usage.html index 9b8148c7798..eb9b8c729b7 100644 --- a/TAO/CIAO/examples/Hello/ReDaC-Usage.html +++ b/TAO/CIAO/examples/Hello/ReDaC-Usage.html @@ -4,7 +4,7 @@ <!--//$Id$ --> - + <title>ReDaC Service Usage</title> </head> @@ -78,7 +78,7 @@ Start NodeManagers (NodeDameons) by running <code> run_NodeDaemons.pl </code> </li> - + <ul> @@ -87,7 +87,7 @@ run_NodeDaemons.pl </code> </li> tutorial page. </li> - + </ul> @@ -95,7 +95,7 @@ tutorial page. </li> -o EM.ior -i NodeManagerMap.dat </code> </li> - + <ul> @@ -105,11 +105,11 @@ the endpoint of each individual NodeManager (i.e., Node Daemon) where component(s) will be deployed.</li> - + </ul> - + <ul> @@ -118,7 +118,7 @@ component(s) will be deployed.</li> tutorial page. </li> - + </ul> @@ -127,7 +127,7 @@ $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior</code> </li> - + <ul> @@ -147,7 +147,7 @@ in the interactive mode. (As a normal user, you don't need to worry about the details of what exactly a DomainApplicationManager is.)</li> - + </ul> @@ -197,7 +197,7 @@ Deployment" section of this tutorial.<code> </code> <li> - + <p> Use ReDaC service through <code>Plan_Launcher</code>'s "-r" command line option to perform redeployment and reconfiguration.<br> @@ -212,7 +212,7 @@ additional components to the existing running assembly.</p> <li> - + <p>Run the command <code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -r flattened_deploymentplan_without_ns_remove.cdp </code>will @@ -253,19 +253,19 @@ changes to the existing plan. One could use <a href="http://www.dre.vanderbilt.e <ul> - + <p> You could also use ReDaC service programmatically by writing your own client to invoke ReDaC service. Basically, to accomplish this, your client program needs to:</p> - + <ol> <li>Obtain the <code>ExecutionManager</code> object reference, either through naming service or through IOR file.</li> <li>Invoke the operation <code>perform_redeployment</code> on this interface by passing a single argument type called <code>DeploymentPlan</code>.</li> - + </ol> diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc index f157495c4b6..abde96ca404 100644 --- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -1,7 +1,8 @@ // $Id$ // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver" -project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { +project(Hello_Base_Receiver_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_stub sharedname = Receiver_DnC_stub idlflags += -Sc \ @@ -19,24 +20,25 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - + Header_Files { ReceiverC.h } - + Inline_Files { ReceiverC.inl } } project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_svnt \ Hello_Base_Receiver_DnC_stub sharedname = Receiver_DnC_svnt libs += Receiver_DnC_stub \ Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - + idlflags += -Sc \ -Wb,export_macro=RECEIVER_SVNT_Export \ -Wb,export_include=Receiver_svnt_export.h @@ -70,13 +72,14 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc { project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += Hello_Base_Receiver_DnC_svnt sharedname = Receiver_DnC_exec libs += Receiver_DnC_stub \ Receiver_DnC_svnt \ Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - + idlflags += -Sc \ -Wb,export_macro=RECEIVER_EXEC_Export \ -Wb,export_include=Receiver_exec_export.h @@ -88,10 +91,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { Source_Files { Receiver_exec.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp index 3a1a5d9ade9..318e4c8f3b4 100644 --- a/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp +++ b/TAO/CIAO/examples/Hello/Receiver/Receiver_exec.cpp @@ -28,7 +28,7 @@ namespace CIDL_Receiver_Impl "Receiver - Informed by the Sender \n")); Hello::ReadMessage_var rev - = this->context_->get_connection_read_message + = this->context_->get_connection_read_message (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.idl b/TAO/CIAO/examples/Hello/Sender/Sender.idl index d5cf61b89cc..d182b68008c 100644 --- a/TAO/CIAO/examples/Hello/Sender/Sender.idl +++ b/TAO/CIAO/examples/Hello/Sender/Sender.idl @@ -11,17 +11,17 @@ module Hello /* This is a Sender specific interface which will be used to get the * process start. */ - + interface trigger { void start (); }; - enum COLOR_SELECTION + enum COLOR_SELECTION { empty, - white, - red, + white, + red, yellow }; diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc index a6871565b9b..1363b6c0e71 100644 --- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc +++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc @@ -1,7 +1,8 @@ // $Id$ // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender" -project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { +project(Hello_Base_Sender_DnC_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_stub sharedname = Sender_DnC_stub idlflags += -Sc \ @@ -19,17 +20,18 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - + Header_Files { SenderC.h } - + Inline_Files { SenderC.inl } } project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_svnt \ Hello_Base_Sender_DnC_stub sharedname = Sender_DnC_svnt @@ -55,13 +57,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { SenderS.cpp Sender_svnt.cpp } - + Header_Files { SenderEC.h SenderS.h Sender_svnt.h } - + Inline_Files { SenderEC.inl SenderS.inl @@ -69,6 +71,7 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { } project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao after += Hello_Base_Sender_DnC_svnt sharedname = Sender_DnC_exec libs += Sender_DnC_stub \ @@ -87,13 +90,14 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { Source_Files { Sender_exec.cpp } - + Header_Files { Sender_exec.h } } project (Hello_DnC_Starter) : ciao_client_dnc, valuetype { + avoids += ace_for_tao exename = starter after += Hello_Base_Sender_DnC_stub libs += Sender_DnC_stub Hello_Base_DnC_stub @@ -104,10 +108,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype { Source_Files { starter.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/examples/Hello/Sender/Sender_exec.h index 6a7c122dad3..043973c0826 100644 --- a/TAO/CIAO/examples/Hello/Sender/Sender_exec.h +++ b/TAO/CIAO/examples/Hello/Sender/Sender_exec.h @@ -122,7 +122,7 @@ namespace CIDL_Sender_Impl CORBA::Long hertz_; ::Hello::COLOR_SELECTION color_; - + friend class Message_Impl; }; diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp index d391aa2aff7..7c647ef01dd 100644 --- a/TAO/CIAO/examples/Hello/Sender/starter.cpp +++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp @@ -13,26 +13,26 @@ parse_args (int argc, char *argv[]) { ACE_Get_Opt get_opts (argc, argv, "k:m:"); int c = 0; - + while ((c = get_opts ()) != -1) { switch (c) { case 'k': ior = get_opts.opt_arg (); - break; + break; case 'm': - message = get_opts.opt_arg (); - break; + message = get_opts.opt_arg (); + break; case '?': // display help for use of the server. default: ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s\n" - "-k <Sender IOR> (default is file://Sender.ior)\n", - "-m <Message>\n", - argv [0]), + "Usage: %s\n" + "-k <Sender IOR> (default is file://Sender.ior)\n", + "-m <Message>\n", + argv [0]), -1); break; } @@ -42,7 +42,7 @@ parse_args (int argc, char *argv[]) { ior = "file://Sender.ior"; } - + return 0; } @@ -73,15 +73,15 @@ main (int argc, char *argv[]) if (CORBA::is_nil (sender.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire Sender's objref\n"), -1); } if (message) - { - sender->local_message (message); - } + { + sender->local_message (message); + } sender->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/CIAO/examples/Hello/descriptors/Hello.cid b/TAO/CIAO/examples/Hello/descriptors/Hello.cid index 31386b59efd..f7abad71ded 100644 --- a/TAO/CIAO/examples/Hello/descriptors/Hello.cid +++ b/TAO/CIAO/examples/Hello/descriptors/Hello.cid @@ -10,7 +10,7 @@ <instance xmi:id="a_Sender"> <name>Sender_Instance</name> <package href="Sender.cpd"/> - + <configProperty> <name>ComponentIOR</name> <value> @@ -22,7 +22,7 @@ </value> </value> </configProperty> - + <configProperty> <name>local_message</name> <value> @@ -34,7 +34,7 @@ </value> </value> </configProperty> - + <configProperty> <name>hertz</name> <value> @@ -47,13 +47,13 @@ </value> </configProperty> </instance> - - <!-- ***************************** --> - + + <!-- ***************************** --> + <instance xmi:id="a_Receiver"> <name>Receiver_Instance</name> <package href="Receiver.cpd"/> - + <configProperty> <name>ComponentIOR</name> <value> @@ -66,7 +66,7 @@ </value> </configProperty> </instance> - + <connection> <name>Messages</name> <internalEndpoint> diff --git a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp index 31dfaa5c81e..7192a2bc061 100644 --- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp +++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp @@ -1,4 +1,4 @@ -<!-- This flattened deployment plan allows component instance to +<!-- This flattened deployment plan allows component instance to register to naming service, if you don't want to use naming service at all, you can use the flattened_deployment_without_ns.cdp as your deployment descriptor. --> @@ -16,7 +16,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -28,7 +28,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -81,7 +81,7 @@ <value> <string>Sender_001</string> </value> - </value> + </value> </configProperty> <!-- Add this property if you want to initialize component attribute --> @@ -94,7 +94,7 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> <!-- This attribute initializes an enumerated value --> <configProperty> @@ -183,7 +183,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -201,7 +201,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -219,7 +219,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -237,4 +237,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp index 9212b855367..8b42fa056ef 100644 --- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp +++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -165,7 +165,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -183,7 +183,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -201,7 +201,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -219,4 +219,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test.pl b/TAO/CIAO/examples/Hello/descriptors/run_test.pl index 1e3917dffa9..cfb0e0e9e49 100755 --- a/TAO/CIAO/examples/Hello/descriptors/run_test.pl +++ b/TAO/CIAO/examples/Hello/descriptors/run_test.pl @@ -38,7 +38,7 @@ sub delete_ior_files { unlink PerlACE::LocalFile ("Receiver.ior"); unlink PerlACE::LocalFile ("Sender.ior"); unlink PerlACE::LocalFile ("DAM.ior"); - unlink PerlACE::LocalFile ("ns.ior"); + unlink PerlACE::LocalFile ("ns.ior"); } sub kill_node_daemons { @@ -56,11 +56,11 @@ sub kill_open_processes { $EM->Kill (); $EM->TimedWait (1); } - + if ($ns_running == 1) { $NS->Kill (); $NS->TimedWait (1); - } + } } @@ -135,7 +135,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -146,21 +146,21 @@ print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior"); - + $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( "Receiver.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of receiver could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } if (PerlACE::waitforfile_timed ("Sender.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index 10a167a513e..c0659c4299f 100755 --- a/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -104,7 +104,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -115,21 +115,21 @@ print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", "-p flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior"); - + $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( "Receiver.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of receiver could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } if (PerlACE::waitforfile_timed ("Sender.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr b/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr index 1fd5b174edf..a3881225930 100644 --- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr +++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr @@ -4,17 +4,17 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd"> - + <cmdline> <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg> </cmdline> - + <svcconf> <uri> svcconf.uri </uri> </svcconf> - + <orbConfigs> <resources> <threadpool id="threadpool-1"> @@ -26,7 +26,7 @@ <max_buffered_requests>10</max_buffered_requests> <max_request_buffered_size>20</max_request_buffered_size> </threadpool> - + <threadpoolWithLanes id="threadpool-2"> <threadpoolLane> <static_threads>50</static_threads> @@ -39,7 +39,7 @@ <max_buffered_requests>10</max_buffered_requests> <max_request_buffered_size>20</max_request_buffered_size> </threadpoolWithLanes> - + <connectionBands id="cb-1"> <band> <low>0</low> @@ -51,7 +51,7 @@ </band> </connectionBands> </resources> - + <policySet id="test_policy_set_id"> <priorityModel server_priority="10"> <priority_model>SERVER_DECLARED</priority_model> @@ -59,12 +59,12 @@ <priorityModel> <priority_model>CLIENT_PROPAGATED</priority_model> </priorityModel> - + <threadpool>threadpool-1</threadpool> <threadpool>threadpool-2</threadpool> - + <priorityBandedConnection>cb-1</priorityBandedConnection> - + </policySet> </orbConfigs> -</CIAO:ServerResources> +</CIAO:ServerResources>
\ No newline at end of file diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp index cfd0688d09e..72e1694b1c3 100644 --- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:deploymentPlan - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd"> diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr index b55d7ee52e5..cd3d1bf8f7d 100644 --- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr +++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr @@ -5,17 +5,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd" id="test_server_resource_id"> - + <cmdline> - <arg> -ORBDebugLevel 10 -ORBEndpoint corbaloc://foo/bar</arg> + <arg>-r</arg> </cmdline> - + <svcconf> <uri> - svcconf.uri + RTsvc.conf </uri> </svcconf> - + <orbConfigs> <resources> <threadpool id="threadpool-1"> @@ -57,7 +57,7 @@ </band> </connectionBands> </resources> - + <policySet id="test_policy_set_id"> <priorityModel server_priority="1"> <priority_model>SERVER_DECLARED</priority_model> @@ -70,6 +70,6 @@ </priorityModel> <threadpool>threadpool-2</threadpool> </policySet> - + </orbConfigs> </CIAO:ServerResources> diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp index 4254e37e723..10317dbe33e 100644 --- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -195,7 +195,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -213,7 +213,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -231,7 +231,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -262,4 +262,4 @@ </value> </infoProperty> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl index 35bf89a3dd8..a790fef1be0 100644 --- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl +++ b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl @@ -109,7 +109,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -120,21 +120,21 @@ print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", "-p rt-example.cdp -k file://EM.ior -o DAM.ior"); - + $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( "Receiver.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of receiver could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } if (PerlACE::waitforfile_timed ("Sender.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp index 9212b855367..8b42fa056ef 100644 --- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -165,7 +165,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -183,7 +183,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -201,7 +201,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -219,4 +219,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp index e3d8b012065..3cd860509a6 100644 --- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -210,7 +210,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -228,7 +228,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -246,7 +246,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -264,4 +264,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp index 6a7b964dca8..6a34f62e7b0 100644 --- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -166,7 +166,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -184,7 +184,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -202,7 +202,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -220,4 +220,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp b/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp index 31dfaa5c81e..7192a2bc061 100644 --- a/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp @@ -1,4 +1,4 @@ -<!-- This flattened deployment plan allows component instance to +<!-- This flattened deployment plan allows component instance to register to naming service, if you don't want to use naming service at all, you can use the flattened_deployment_without_ns.cdp as your deployment descriptor. --> @@ -16,7 +16,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -28,7 +28,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -81,7 +81,7 @@ <value> <string>Sender_001</string> </value> - </value> + </value> </configProperty> <!-- Add this property if you want to initialize component attribute --> @@ -94,7 +94,7 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> <!-- This attribute initializes an enumerated value --> <configProperty> @@ -183,7 +183,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -201,7 +201,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -219,7 +219,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -237,4 +237,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp index 292c7d3f6c0..a206dc64080 100644 --- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -102,7 +102,7 @@ <instance id="Hello-Receiver-idd"> <name>Hello-Receiver-idd</name> - <node>SenderNode</node> + <node>ReceiverNode</node> <source><!-- @@ What goes here --></source> <implementation>Hello-Receiver-mdd</implementation> <configProperty> @@ -167,7 +167,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -185,7 +185,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -203,7 +203,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -221,4 +221,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp index 215e6729a14..1acfa45c985 100644 --- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp +++ b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp @@ -11,7 +11,7 @@ <label>BasicSP-realizes-cid</label> <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> <specificType><!-- @@ What does here? --></specificType> - <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> <port> <name>read_message</name> <specificType>IDL:Hello/ReadMessage:1.0</specificType> @@ -23,7 +23,7 @@ <kind>SimplexReceptacle</kind> </port> </realizes> - + <implementation id="Hello-Sender-mdd"> <name>Hello-Sender-mdd</name> <source><!-- @@ Don't know what goes here --></source> @@ -75,9 +75,9 @@ <value> <string>This is a test message passed in through XML.</string> </value> - </value> + </value> </configProperty> - + <!-- This attribute initializes an enumerated value --> <configProperty> <name>color</name> @@ -102,7 +102,7 @@ <instance id="Hello-Receiver-idd"> <name>Hello-Receiver-idd</name> - <node>SenderNode</node> + <node>ReceiverNode</node> <source><!-- @@ What goes here --></source> <implementation>Hello-Receiver-mdd</implementation> <configProperty> @@ -113,9 +113,9 @@ </type> <value> <!-- **************************************** - This IOR file should NOT be generated. - DAnCE should NOT create this component instance - because it is a "shared" component + This IOR file should NOT be generated. + DAnCE should NOT create this component instance + because it is a "shared" component **************************************** --> <string>Receiver_new_component.ior</string> </value> @@ -172,7 +172,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Sender_svnt"> <name>Sender_svnt</name> <source><!-- @@ Not sure --></source> @@ -190,7 +190,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_exec"> <name>Receiver_exec</name> <source><!-- @@ Not sure about this--></source> @@ -208,7 +208,7 @@ </value> </execParameter> </artifact> - + <artifact id="Hello-Receiver_svnt"> <name>Receiver_svnt</name> <source><!-- @@ Not sure --></source> @@ -226,4 +226,4 @@ </value> </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:deploymentPlan> diff --git a/TAO/CIAO/examples/Hello/step-by-step.html b/TAO/CIAO/examples/Hello/step-by-step.html index bf7e77da1e2..cb73707d0b7 100644 --- a/TAO/CIAO/examples/Hello/step-by-step.html +++ b/TAO/CIAO/examples/Hello/step-by-step.html @@ -45,7 +45,7 @@ This Hello example is contructed in the following ways: interface <code>ReadMessage</code>, which are used by both the Sender and the Receiver, so we put both of them in Hello.idl.</li> <P> - + <li>Look at the <code>Hello_Base.mpc</code> file to get an idea how the Hello_Base_stub and Hello_Base_svnt projects are organized. <a href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">MPC</a> is a utility we used to generate makefiles or VC project/solution files for all <a href="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</a>, <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a> and <a href="http://www.cs.wustl.edu/~schmidt/CIAO.html">CIAO</a> libraries.</li> </Ol> @@ -132,12 +132,12 @@ Receiver. However, you need to change the Sender.idl to make it <li> Please make sure that the Modified_Deployment.xsd and XMI.xsd files are in the Hello/descriptors directory. The former file could be found in $CIAO_ROOT/docs/schema directory. <P> -<li> Create the <em>NodeManagerMap.dat</em> file containing the CORBALOC IIOP address of each <code>NodeManager</code> - where it is running. Please refer to the existing <code>NodeManagerMap.dat</code> for details, - as you can see, we only specify 2 <code>NodeManagers</code>, which means these two components +<li> Create the <em>NodeManagerMap.dat</em> file containing the CORBALOC IIOP address of each <code>NodeManager</code> + where it is running. Please refer to the existing <code>NodeManagerMap.dat</code> for details, + as you can see, we only specify 2 <code>NodeManagers</code>, which means these two components will be installed in the different <code>NodeApplication</code> server. Please refer to the <em>flattened_deploymentplan.cdp</em> file to see how a deployer - could specify the mapping between components and nodes.</li> + could specify the mapping between components and nodes.</li> Note: Creating the deployment plan descriptor is a tedious and error-prone job, you can download <a @@ -158,26 +158,26 @@ Finally you are ready to deploy the component-based application you have develop <LI> Go into the <em> descriptors </em> directory Start NodeManagers (NodeDameon) by running <code> run_NodeDaemons.pl </code> <P> - + <LI> Start the execution manager: <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code> </LI> - - <ul type="square"> <li> <em>NOTE</em>: As one can see, we use the "NodeManagerMap.dat" file to instruct the + + <ul type="square"> <li> <em>NOTE</em>: As one can see, we use the "NodeManagerMap.dat" file to instruct the Execution_Manager how to find the endpoint of each individual NodeManager (i.e., Node Daemon) where component(s) will be deployed, so this is non-standard. We plan to use Naming Service to do this in the future. </ul><P> <LI> Start the plan launcher: <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp -k file://EM.ior </code> - + <ul type="square"> <li> If you don't want to register component(s) with CORBA naming service, then you don't have to start your naming service, and you can use the below code to start the executor: - + <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan_without_ns.cdp -k file://EM.ior </code><P> - + After this, components should be deployed successfully. </ul><P> - + <LI> You can go into the <em> $CIAO_ROOT/DAnCE/examples/Hello/descriptor </em> directory and run the diff --git a/TAO/CIAO/examples/Philosophers/README b/TAO/CIAO/examples/Philosophers/README index fcaf73fc4a6..96a56e61b73 100644 --- a/TAO/CIAO/examples/Philosophers/README +++ b/TAO/CIAO/examples/Philosophers/README @@ -1 +1 @@ -This example is unfinished. +This example is unfinished.
\ No newline at end of file diff --git a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc index 3e12160cb00..ba9357c2fd8 100644 --- a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc +++ b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Hello_Base" -project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc { +project(Hello_Base_DnC_Upgradeable_stub): ciao_events_base_dnc { sharedname = Hello_Base_DnC_Upgradeable_stub idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc index 2366b57c08c..3a587791546 100644 --- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc +++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc @@ -1,7 +1,8 @@ // $Id$ // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver" -project(Hello_Base_Receiver_DnC_Upgradeable_stub): ciao_client_dnc { +project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_Upgradeable_stub sharedname = Receiver_DnC_Upgradeable_stub idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h @@ -17,11 +18,12 @@ project(Hello_Base_Receiver_DnC_Upgradeable_stub): ciao_client_dnc { } } -project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc { - after += Hello_Base_DnC_Upgradeable_svnt Hello_Base_Receiver_DnC_Upgradeable_stub +project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc { + avoids += ace_for_tao + after += Hello_Base_DnC_Upgradeable_svnt HelloB_Receiver_DnC_Upgradeable_stub sharedname = Receiver_DnC_Upgradeable_svnt libs += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt - + idlflags += -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h dynamicflags = RECEIVER_SVNT_BUILD_DLL cidlflags -= -- @@ -43,11 +45,12 @@ project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc { } -project(Hello_Base_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc { - after += Hello_Base_Receiver_DnC_Upgradeable_svnt +project(HelloB_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc { + avoids += ace_for_tao + after += HelloB_Receiver_DnC_Upgradeable_svnt sharedname = Receiver_DnC_Upgradeable_exec libs += Receiver_DnC_Upgradeable_stub Receiver_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt - + idlflags += -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h dynamicflags = RECEIVER_EXEC_BUILD_DLL diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp index d91539ae57a..e4f4691c9b1 100644 --- a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp +++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp @@ -50,7 +50,7 @@ namespace CIDL_Receiver_Impl "Receiver - Informed by the Sender \n")); Hello::ReadMessage_var rev - = this->context_->get_connection_read_message + = this->context_->get_connection_read_message (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -173,17 +173,17 @@ namespace CIDL_Receiver_Impl Components::CCMException)) { Components::EnterpriseComponent_ptr tmp; - + ACE_NEW_THROW_EX (tmp, ReceiverSwap_exec_i, CORBA::NO_MEMORY ()); - - /* + + /* ACE_NEW_THROW_EX (tmp, Receiver_exec_i, CORBA::NO_MEMORY ()); */ - + return tmp; } diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h index beb75f1b211..e05ff6a138f 100644 --- a/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h +++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver_exec.h @@ -25,8 +25,8 @@ namespace CIDL_Receiver_Impl */ class RECEIVER_EXEC_Export ReceiverSwap_exec_i : - public virtual CIAO::Swap_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual CIAO::Swap_Exec, + public virtual TAO_Local_RefCounted_Object { public: ReceiverSwap_exec_i (); @@ -43,8 +43,8 @@ namespace CIDL_Receiver_Impl }; class RECEIVER_EXEC_Export Receiver_exec_i : - public virtual Receiver_Exec, - public virtual TAO_Local_RefCounted_Object + public virtual Receiver_Exec, + public virtual TAO_Local_RefCounted_Object { public: @@ -117,7 +117,7 @@ namespace CIDL_Receiver_Impl ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr createReceiverHome_Impl (void); } diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.idl b/TAO/CIAO/examples/Swapping/Sender/Sender.idl index 0f89e1d6119..e2c8ca64b0e 100644 --- a/TAO/CIAO/examples/Swapping/Sender/Sender.idl +++ b/TAO/CIAO/examples/Swapping/Sender/Sender.idl @@ -11,7 +11,7 @@ module Hello /* This is a Sender specific interface which will be used to get the * process start. */ - + interface trigger { void start (); diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc index 96f00b1718b..f2490ad5976 100644 --- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc +++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc @@ -1,7 +1,8 @@ // $Id$ // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender" -project(Hello_Base_Sender_DnC_Upgradeable_stub): ciao_client_dnc { +project(HelloB_Sender_DnC_Upgradeable_stub): ciao_events_base_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_Upgradeable_stub sharedname = Sender_DnC_Upgradeable_stub idlflags += -Wb,stub_export_macro=SENDER_STUB_Export -Wb,stub_export_include=Sender_stub_export.h -Wb,skel_export_macro=SENDER_SVNT_Export -Wb,skel_export_include=Sender_svnt_export.h @@ -18,9 +19,10 @@ project(Hello_Base_Sender_DnC_Upgradeable_stub): ciao_client_dnc { } } -project(Hello_Base_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc { +project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc { + avoids += ace_for_tao after += Hello_Base_DnC_Upgradeable_svnt \ - Hello_Base_Sender_DnC_Upgradeable_stub + HelloB_Sender_DnC_Upgradeable_stub sharedname = Sender_DnC_Upgradeable_svnt libs += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub \ Hello_Base_DnC_Upgradeable_svnt @@ -45,8 +47,9 @@ project(Hello_Base_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc { } } -project(Hello_Base_Sender_DnC_Upgradeable_exec) : ciao_component_dnc { - after += Hello_Base_Sender_DnC_Upgradeable_svnt +project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc { + avoids += ace_for_tao + after += HelloB_Sender_DnC_Upgradeable_svnt sharedname = Sender_DnC_Upgradeable_exec libs += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt @@ -61,9 +64,10 @@ project(Hello_Base_Sender_DnC_Upgradeable_exec) : ciao_component_dnc { } } -project(Hello_Base_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc { - after += Hello_Base_Sender_DnC_Upgradeable_svnt \ - Hello_Base_Sender_DnC_Upgradeable_exec +project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc { + avoids += ace_for_tao + after += HelloB_Sender_DnC_Upgradeable_svnt \ + HelloB_Sender_DnC_Upgradeable_exec sharedname = Sender_DnC_Upgradeable_exec_1 libs += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt \ Sender_DnC_Upgradeable_exec Hello_Base_DnC_Upgradeable_stub \ @@ -81,9 +85,10 @@ project(Hello_Base_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc { } } -project(Hello_Base_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc { - after += Hello_Base_Sender_DnC_Upgradeable_svnt \ - Hello_Base_Sender_DnC_Upgradeable_exec +project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc { + avoids += ace_for_tao + after += HelloB_Sender_DnC_Upgradeable_svnt \ + HelloB_Sender_DnC_Upgradeable_exec sharedname = Sender_DnC_Upgradeable_exec_2 libs += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt \ Sender_DnC_Upgradeable_exec Hello_Base_DnC_Upgradeable_stub \ @@ -102,8 +107,9 @@ project(Hello_Base_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc { } project (Hello_DnC_Upgradeable_Starter) : ciao_client_dnc, valuetype{ + avoids += ace_for_tao exename = Upgradeable_starter - after += Hello_Base_Sender_DnC_Upgradeable_stub + after += HelloB_Sender_DnC_Upgradeable_stub libs += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub IDL_Files { diff --git a/TAO/CIAO/examples/Swapping/Sender/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp index 3f795c2aefc..c88771ea568 100644 --- a/TAO/CIAO/examples/Swapping/Sender/starter.cpp +++ b/TAO/CIAO/examples/Swapping/Sender/starter.cpp @@ -13,27 +13,27 @@ parse_args (int argc, char *argv[]) { ACE_Get_Opt get_opts (argc, argv, "k:m"); int c = 0; - + while ((c = get_opts ()) != -1) { switch (c) { case 'k': ior = get_opts.opt_arg (); - break; + break; case 'm': - message = get_opts.opt_arg (); - break; + message = get_opts.opt_arg (); + break; case '?': // display help for use of the server. default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s\n" - "-k <Sender IOR> (default is file://sender.ior)\n", - "-m <Message> (default is starters message)\n" - "\n", - argv [0]), + "usage: %s\n" + "-k <Sender IOR> (default is file://sender.ior)\n", + "-m <Message> (default is starters message)\n" + "\n", + argv [0]), -1); break; } @@ -43,7 +43,7 @@ parse_args (int argc, char *argv[]) { ior = "file://sender.ior"; } - + return 0; } @@ -74,7 +74,7 @@ main (int argc, char *argv[]) if (CORBA::is_nil (sender.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire Sender's objref\n"), -1); } |
