diff options
Diffstat (limited to 'TAO/CIAO/examples')
56 files changed, 353 insertions, 353 deletions
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc index 652dab2f7a3..c676d5b7f66 100644 --- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc +++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc @@ -6,9 +6,9 @@ project(BMClosedED_DnC_stub): ciao_client_dnc { 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 @@ -29,12 +29,12 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc { 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 @@ -60,11 +60,11 @@ project(BMClosedED_DnC_exec) : ciao_component_dnc { 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_exec.cpp b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp index 089ea646f76..a4c783f882d 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 5a28ed1b783..d73f69ce65e 100644 --- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc +++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc @@ -6,12 +6,12 @@ project(BMDisplay_DnC_stub): ciao_client_dnc { 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 { @@ -32,7 +32,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 @@ -58,12 +58,12 @@ project(BMDisplay_DnC_exec) : ciao_component_dnc { 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 f0fc61007d7..6b075cf9c5c 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/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc index c850d19e968..381afbe454f 100644 --- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc +++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc @@ -6,9 +6,9 @@ project(EC_DnC_stub): ciao_client_dnc { 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 @@ -30,7 +30,7 @@ project(EC_DnC_svnt) : ciao_servant_dnc { 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 @@ -61,7 +61,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 diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp index d52ac54dba9..d385ad186d1 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 00c785c7c2f..c9ce1dfd2e3 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 6f4bbd25734..9ad8b55bacb 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
\ No newline at end of file +TimerDevice corbaloc:iiop:localhost:20000/NodeManager diff --git a/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl b/TAO/CIAO/examples/BasicSP/descriptors/basicNodeDaemon.pl index 582b0b95358..7c4dc98c25d 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 d3aa1197327..fdeb12c4da8 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 9722a2747b9..323b0aeb053 100644 --- a/TAO/CIAO/examples/Display/GPS/GPS.mpc +++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc @@ -8,7 +8,7 @@ project(GPS_DnC_stub): ciao_client_dnc { libpaths+=.. libs += HUDisplay_DnC_stub dynamicflags = GPS_STUB_BUILD_DLL - + IDL_Files { GPS.idl } @@ -55,7 +55,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 29016a5c4d6..1290bde29a3 100644 --- a/TAO/CIAO/examples/Display/HUDisplay.mpc +++ b/TAO/CIAO/examples/Display/HUDisplay.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n HUDisplay" project(HUDisplay_DnC_stub): ciao_client_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 dynamicflags = HUDISPLAY_STUB_BUILD_DLL @@ -19,20 +19,20 @@ project(HUDisplay_DnC_stub): ciao_client_dnc { project(HUDisplay_DnC_svnt) : ciao_servant_dnc { after += HUDisplay_DnC_stub sharedname = HUDisplay_DnC_svnt - libs += HUDisplay_DnC_stub - + libs += HUDisplay_DnC_stub + //idlflags += -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h - + 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 - + dynamicflags = HUDISPLAY_SVNT_BUILD_DLL - + Source_Files { - + HUDisplayS.cpp - + } } diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc index 5aeaaa0ef8a..12505060fdb 100644 --- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc +++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc @@ -20,7 +20,7 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc { 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 diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/trolltech.gif Binary files differindex f674369efc4..66da94fb44c 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 99fe78a7673..efaf4c37e90 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 3f6958893db..8bc7ee110bb 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 d063453a020..2ce4b9f6aa0 100644 --- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc +++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc @@ -73,6 +73,6 @@ project(RateGen_DnC_exec) : ciao_component_dnc { controller.cpp } } - + diff --git a/TAO/CIAO/examples/Display/descriptors/EM.ior b/TAO/CIAO/examples/Display/descriptors/EM.ior index e177e5d5062..9bead57c287 100644 --- a/TAO/CIAO/examples/Display/descriptors/EM.ior +++ b/TAO/CIAO/examples/Display/descriptors/EM.ior @@ -1 +1 @@ -IOR:010000002400000049444c3a4349414f2f457865637574696f6e4d616e616765724461656d6f6e3a312e3000010000000000000078000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000c89f00001b00000014010f00525354ca168142626304000000000001000000010000000002000000000000000800000001000000004f415401000000140000000176e9b601000100000000000901010000000000
\ No newline at end of file +IOR:010000002400000049444c3a4349414f2f457865637574696f6e4d616e616765724461656d6f6e3a312e3000010000000000000078000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000c89f00001b00000014010f00525354ca168142626304000000000001000000010000000002000000000000000800000001000000004f415401000000140000000176e9b601000100000000000901010000000000 diff --git a/TAO/CIAO/examples/Display/descriptors/GPS.ior b/TAO/CIAO/examples/Display/descriptors/GPS.ior index d5469764621..3338f591312 100644 --- a/TAO/CIAO/examples/Display/descriptors/GPS.ior +++ b/TAO/CIAO/examples/Display/descriptors/GPS.ior @@ -1 +1 @@ -IOR:010000001600000049444c3a4855446973706c61792f4750533a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file +IOR:010000001600000049444c3a4855446973706c61792f4750533a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000 diff --git a/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior b/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior index 9dc8184f9a9..12ee7567186 100644 --- a/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior +++ b/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior @@ -1 +1 @@ -IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e456475000038b100002300000014010f004e535400fa7842a820000001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ No newline at end of file +IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e456475000038b100002300000014010f004e535400fa7842a820000001000000010000000100000001000000020000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000 diff --git a/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior b/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior index 0eefd174095..4fa3741ac5a 100644 --- a/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior +++ b/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior @@ -1 +1 @@ -IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000500000001000000060000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ No newline at end of file +IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000500000001000000060000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000 diff --git a/TAO/CIAO/examples/Display/descriptors/RateGen.ior b/TAO/CIAO/examples/Display/descriptors/RateGen.ior index 60326a12b43..e589de21d27 100644 --- a/TAO/CIAO/examples/Display/descriptors/RateGen.ior +++ b/TAO/CIAO/examples/Display/descriptors/RateGen.ior @@ -1 +1 @@ -IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000
\ No newline at end of file +IOR:010000001a00000049444c3a4855446973706c61792f5261746547656e3a312e30000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000300000001000000040000000002000000000000000800000001000000004f415401000000140000000126f0b601000100000000000901010000000000 diff --git a/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/TAO/CIAO/examples/Display/descriptors/basicNodeDaemon.pl index da93ff1c72d..a3dc38609e7 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 ddfd9a3ca37..c92a18ffb0c 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 b5c00fea2c8..4bfcf5bcd20 100644 --- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Hello_Base" project(Hello_Base_DnC_stub): ciao_client_dnc { - + sharedname = Hello_Base_DnC_stub idlflags += -Sc \ -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ @@ -18,11 +18,11 @@ project(Hello_Base_DnC_stub): ciao_client_dnc { Source_Files { Hello_BaseC.cpp } - + Header_Files { Hello_BaseC.h } - + Inline_Files { Hello_BaseC.inl } @@ -31,14 +31,14 @@ project(Hello_Base_DnC_stub): ciao_client_dnc { project(Hello_Base_DnC_svnt) : ciao_servant_dnc { after += Hello_Base_DnC_stub sharedname = Hello_Base_DnC_svnt - libs += Hello_Base_DnC_stub - + libs += Hello_Base_DnC_stub + idlflags += -Sc \ -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 - dynamicflags = HELLO_BASE_SVNT_BUILD_DLL + dynamicflags = HELLO_BASE_SVNT_BUILD_DLL IDL_Files { Hello_Base.idl @@ -47,11 +47,11 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc { Source_Files { Hello_BaseS.cpp } - + Header_Files { Hello_BaseS.h } - + Inline_Files { Hello_BaseS.inl } diff --git a/TAO/CIAO/examples/Hello/ReDaC-Usage.html b/TAO/CIAO/examples/Hello/ReDaC-Usage.html index eb9b8c729b7..9b8148c7798 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 5aa0c89e176..f157495c4b6 100644 --- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -19,11 +19,11 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - + Header_Files { ReceiverC.h } - + Inline_Files { ReceiverC.inl } @@ -36,7 +36,7 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc { 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 @@ -76,7 +76,7 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { 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 +88,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 318e4c8f3b4..3a1a5d9ade9 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 d182b68008c..d5cf61b89cc 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 45b4dd2db78..a6871565b9b 100644 --- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc +++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc @@ -19,11 +19,11 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - + Header_Files { SenderC.h } - + Inline_Files { SenderC.inl } @@ -55,13 +55,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 @@ -87,7 +87,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { Source_Files { Sender_exec.cpp } - + Header_Files { Sender_exec.h } @@ -104,10 +104,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 043973c0826..6a7c122dad3 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 7c647ef01dd..d391aa2aff7 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 f7abad71ded..31386b59efd 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 7192a2bc061..31dfaa5c81e 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 8b42fa056ef..9212b855367 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 cfb0e0e9e49..1e3917dffa9 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 c0659c4299f..10a167a513e 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 a3881225930..1fd5b174edf 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>
\ No newline at end of file +</CIAO:ServerResources> 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 72e1694b1c3..cfd0688d09e 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 9c63f545984..b55d7ee52e5 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> </cmdline> - + <svcconf> <uri> svcconf.uri </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>
\ No newline at end of file +</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 10317dbe33e..4254e37e723 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 a790fef1be0..35bf89a3dd8 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 8b42fa056ef..9212b855367 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 3cd860509a6..e3d8b012065 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 6a34f62e7b0..6a7b964dca8 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 7192a2bc061..31dfaa5c81e 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 c8bf5543c05..292c7d3f6c0 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> @@ -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 4565256398b..215e6729a14 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> @@ -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 cb73707d0b7..bf7e77da1e2 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 96a56e61b73..fcaf73fc4a6 100644 --- a/TAO/CIAO/examples/Philosophers/README +++ b/TAO/CIAO/examples/Philosophers/README @@ -1 +1 @@ -This example is unfinished.
\ No newline at end of file +This example is unfinished. diff --git a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc index 22c0598f8a7..3e12160cb00 100644 --- a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc +++ b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -n Hello_Base" project(Hello_Base_DnC_Upgradeable_stub): ciao_client_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 dynamicflags = HELLO_BASE_STUB_BUILD_DLL @@ -19,8 +19,8 @@ project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc { project(Hello_Base_DnC_Upgradeable_svnt) : ciao_servant_dnc { after += Hello_Base_DnC_Upgradeable_stub sharedname = Hello_Base_DnC_Upgradeable_svnt - libs += Hello_Base_DnC_Upgradeable_stub - + libs += 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 dynamicflags = HELLO_BASE_SVNT_BUILD_DLL diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc index 6dfd8271a73..2366b57c08c 100644 --- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc +++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc @@ -21,7 +21,7 @@ project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc { after += Hello_Base_DnC_Upgradeable_svnt Hello_Base_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 -= -- @@ -47,7 +47,7 @@ project(Hello_Base_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc { after += Hello_Base_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 e4f4691c9b1..d91539ae57a 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 e05ff6a138f..beb75f1b211 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 e2c8ca64b0e..0f89e1d6119 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/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp index c88771ea568..3f795c2aefc 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); } |