diff options
Diffstat (limited to 'TAO/CIAO/examples/Hello')
25 files changed, 185 insertions, 185 deletions
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 |