diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-02-11 14:59:08 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-02-11 14:59:08 +0000 |
| commit | 1d548515ebcc0fecee1bc83c1a46505f07757170 (patch) | |
| tree | 94c4f1e2792532189cf0f536ab4c3d4ea608f21c /CIAO/examples/Hello | |
| parent | 500fdb3bc07404d9b62f72a84d69f510108168df (diff) | |
| download | ATCD-1d548515ebcc0fecee1bc83c1a46505f07757170.tar.gz | |
ChangeLogTag: Wed Feb 11 14:46:15 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'CIAO/examples/Hello')
67 files changed, 294 insertions, 5606 deletions
diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc index 01fcc996184..3fd5fcd83a8 100644 --- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -14,7 +14,7 @@ project(Hello_Base_idl_gen) : taoidldefaults, anytypecode { } } -project(Hello_Base_stub) : ciao_client_dnc { +project(Hello_Base_stub) : ccm_stub { avoids += ace_for_tao after += Hello_Base_idl_gen libs += @@ -40,7 +40,7 @@ project(Hello_Base_stub) : ciao_client_dnc { } -project(Hello_Base_skel) : ciao_component_dnc { +project(Hello_Base_skel) : ccm_svnt { avoids += ace_for_tao after += Hello_Base_stub sharedname = Hello_Base_skel diff --git a/CIAO/examples/Hello/ReDaC-Usage.html b/CIAO/examples/Hello/ReDaC-Usage.html deleted file mode 100644 index eb9b8c729b7..00000000000 --- a/CIAO/examples/Hello/ReDaC-Usage.html +++ /dev/null @@ -1,308 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<!--//$Id$ --> - - - - <title>ReDaC Service Usage</title> -</head> - - -<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" alink="#0000ff" link="#000fff" vlink="#ff0f0f"> - - -<hr> -<h2>Simple Tutorial for using ReDaC (<span style="font-style: italic;">Redeployment and Reconfiguration</span>)</h2> - - -<span style="font-weight: bold;">Prerequisite</span><b>:<br> - - -<br> - - -</b>Before you proceed further, please read the <a href="./step-by-step.html">step-by-step</a> tutorial -page first.<b><br> - - -<br> - - -</b><b>Note:</b> -<br> - - -<ul> - - - <li>ReDaC is a middleware service provided by the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/docs/releasenotes/dance.html">DAnCE</a> -framework.</li> - - - <li>ReDaC service is used for redeployment and/or -reconfiguration of your running component-based application on -the fly without shutting down your application. </li> - - - <li>ReDaC currently works for CIAO QoS-enabled component -middleware only.</li> - - -</ul> - - -<hr> -<h2>Example Description</h2> - - -We will use the Hello example to illustrate how one could use ReDaC -service to perform redeployment and reconfiguration. -<hr> -<h3>Initial Deployment</h3> - - -Below steps are required for the initial deployment of your application, -which is performed by DAnCE. The below steps are different from those -presented in the <a href="./step-by-step.html">step-by-step</a> -tutorial page in the sense that we pass different command line options -to the <span style="font-style: italic;">Plan_Launcher</span> -client:<br> - - -<ul> - - - <li> Go into the <em> descriptors </em> directory -Start NodeManagers (NodeDameons) by running <code> -run_NodeDaemons.pl </code> </li> - - - - <ul> - - - <li>This step is the same as the one presented in the - <a href="step-by-step.html">step-by-step</a> -tutorial page. </li> - - - - </ul> - - - <li> Start the execution manager: <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager --o EM.ior -i NodeManagerMap.dat </code> </li> - - - - <ul> - - - <li> 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.</li> - - - - </ul> - - - - <ul> - - - <li>This step is the same as the one presented in the - <a href="step-by-step.html">step-by-step</a> -tutorial page. </li> - - - - </ul> - - - <li> Start the plan launcher: <code> -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p -flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior</code> </li> - - - - <ul> - - - <li>After this, components should be deployed -successfully. </li> - - - <li>This step is different from the one presented -in the - <a href="step-by-step.html">step-by-step</a> -tutorial page in the way that we added an additional "<code>-o</code>" -option when running <code>Plan_Launcher</code>, which -dumps an IOR file of DAnCE's DomainApplicationManager. With -this option added, the <code>plan_launcher </code>will -exit immediately after the application is deployed, instead of staying -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> - - -</ul> - - -<hr> -<h3>Redeployment and Reconfiguration</h3> - - -Basically, you could use ReDaC service in two ways. <br> - - -<ol style="font-weight: bold;"> - - - <li>Use ReDaC service <span style="font-style: italic;">directly</span> -through DAnCE's <span style="font-style: italic;">Plan_Launcher</span> -client</li> - - - <li><span style="font-weight: bold;">Use ReDaC -service <span style="font-style: italic;">programmatically</span> -by writing your own client</span></li> - - -</ol> - - -This tutorial illustrates how exactly you could use ReDaC.<br> - - -<br style="font-weight: bold;"> - - -<span style="font-weight: bold;">Use ReDaC service through -</span><span style="font-style: italic; font-weight: bold;">Plan_Launcher</span><span style="font-weight: bold;"> of DAnCE:</span><br> - - -<ul> - - - <li>As we've already mentioned, you should first deploy your -Hello application with DAnCE, which is described in the above "Initial -Deployment" section of this tutorial.<code> </code> - </li> - - - <li> - - <p> Use ReDaC service through <code>Plan_Launcher</code>'s -"-r" command line option to perform redeployment and reconfiguration.<br> - - -Run the command - <code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -r -flattened_deploymentplan_without_ns_add.cdp </code>will add -additional components to the existing running assembly.</p> - - - </li> - - - <li> - - <p>Run the command - <code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -r -flattened_deploymentplan_without_ns_remove.cdp </code>will -remove components from the existing running assembly.</p> - - - </li> - - - <li>Run the command - <code></code><code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher --i file://DAM.ior</code> will tear down your entire application -completely.</li> - - -</ul> - - -<br> - - -<div style="margin-left: 40px;"><span style="font-weight: bold;">NOTE: </span>By -using ReDaC through Plan_Launcher, as a user you must provide a new -DeploymentPlan (.cdp) XML file, which captures the new deployment and -configuration settings of your application, and the Plan_UUID of the -new DeploymentPlan should be the same as the one of the old -(running) DeploymentPlan. Otherwise, DAnCE will think you want to -deploy a totally different deployment plan, instead of applying some -changes to the existing plan. One could use <a href="http://www.dre.vanderbilt.edu/cosmic">CoSMIC</a> MDD tool to create such a deployment plan XML file.<br> - -</div> - - -<br> - - -<span style="font-weight: bold;">Use ReDaC service <span style="font-style: italic;">programmatically</span>:</span><span style="font-weight: bold;"></span> -<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> - - -</ul> - - -<div style="margin-left: 40px;">The IDL signature of this operation is as follows:<br> - -<code><br> - - void perform_redeployment (in DeploymentPlan new_plan)<br> - - raises (PlanError,<br> - - InstallationFailure,<br> - - UnknownImplId,<br> - - ImplEntryPointNotFound,<br> - - InvalidConnection,<br> - - InvalidProperty,<br> - - ::Components::RemoveFailure);</code><br> - -</div> - - -<br> -<div style="margin-left: 40px;">In order to simplify the creation of a the <code>"new_plan", </code>we are implementing a utility class which allows a developer to easily manipulate a deployment plan data structure.</div> - - -<hr> -<b>Email: </b> -<address>ciao-users@cse.wustl.edu</address> - - -</body> -</html> diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc index 94054fa4ce1..6a0a3cfa2c5 100644 --- a/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -32,7 +32,7 @@ project(Hello_Receiver_cidl_gen) : ciaocidldefaults, taoidldefaults { } } -project(Hello_Receiver_stub) : ciao_client_dnc { +project(Hello_Receiver_stub) : ccm_stub { avoids += ace_for_tao after += Hello_Receiver_idl_gen Hello_Base_stub libs += Hello_Base_stub @@ -57,7 +57,7 @@ project(Hello_Receiver_stub) : ciao_client_dnc { } } -project(Hello_Receiver_exec) : ciao_component_dnc { +project(Hello_Receiver_exec) : ciao_executor { avoids += ace_for_tao after += Hello_Receiver_cidl_gen Hello_Receiver_stub sharedname = Hello_Receiver_exec @@ -85,7 +85,7 @@ project(Hello_Receiver_exec) : ciao_component_dnc { } -project(Hello_Receiver_svnt) : ciao_servant_dnc { +project(Hello_Receiver_svnt) : ciao_servant { avoids += ace_for_tao after += Hello_Base_skel Hello_Receiver_exec sharedname = Hello_Receiver_svnt diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp index b2de2e9c7ab..ab2635814fc 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp @@ -36,7 +36,7 @@ namespace CIDL_Receiver_Impl { //Get the message from the Sender first. ACE_DEBUG ((LM_DEBUG, - "Receiver - Informed by the Sender with message [%s]\n", + "Receiver - Informed by the Sender with message [%C]\n", ev->data ())); Hello::ReadMessage_var rev @@ -48,7 +48,7 @@ namespace CIDL_Receiver_Impl CORBA::String_var str = rev->get_message (); ACE_DEBUG ((LM_DEBUG, - "Receiver - Got message from the server [%s] \n", + "Receiver - Got message from the server [%C]\n", str.in () )); } @@ -68,10 +68,10 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ciao_preactivate () + Receiver_exec_i::configuration_complete () { ACE_DEBUG ((LM_DEBUG, - "Receiver_exec_i::ciao_preactivate\n")); + "Receiver_exec_i::configuration_complete\n")); } void @@ -81,13 +81,6 @@ namespace CIDL_Receiver_Impl } void - Receiver_exec_i::ciao_postactivate () - { - ACE_DEBUG ((LM_DEBUG, - "Receiver_exec_i::ciao_postactivate\n")); - } - - void Receiver_exec_i::ccm_passivate () { ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate\n")); diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h index 2e1d473a34a..e24520126c7 100644 --- a/CIAO/examples/Hello/Receiver/Receiver_exec.h +++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h @@ -58,15 +58,10 @@ namespace CIDL_Receiver_Impl // Operations from Components::SessionComponent virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void ciao_preactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); - - virtual void ciao_postactivate (); - - virtual void ccm_passivate (); - virtual void ccm_remove (); protected: diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc index 0f26536a785..85f9fd94d1f 100644 --- a/CIAO/examples/Hello/Sender/Sender.mpc +++ b/CIAO/examples/Hello/Sender/Sender.mpc @@ -32,7 +32,7 @@ project(Hello_Sender_cidl_gen) : ciaocidldefaults, taoidldefaults { } } -project(Hello_Sender_stub) : ciao_client_dnc { +project(Hello_Sender_stub) : ccm_stub { avoids += ace_for_tao after += Hello_Sender_idl_gen Hello_Base_stub libs += Hello_Base_stub @@ -57,7 +57,7 @@ project(Hello_Sender_stub) : ciao_client_dnc { } } -project(Hello_Sender_exec) : ciao_component_dnc { +project(Hello_Sender_exec) : ciao_executor { avoids += ace_for_tao after += Hello_Sender_cidl_gen Hello_Sender_stub sharedname = Hello_Sender_exec @@ -85,7 +85,7 @@ project(Hello_Sender_exec) : ciao_component_dnc { } -project(Hello_Sender_svnt) : ciao_servant_dnc { +project(Hello_Sender_svnt) : ciao_servant { avoids += ace_for_tao after += Hello_Base_skel Hello_Sender_exec sharedname = Hello_Sender_svnt @@ -118,7 +118,7 @@ project(Hello_Sender_svnt) : ciao_servant_dnc { } } -project (Hello_starter) : ciao_client_dnc, valuetype { +project (Hello_starter) : ccm_stub, valuetype { avoids += ace_for_tao exename = starter after += Hello_Sender_stub diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp index 05834007ace..e2c27d3e202 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.cpp +++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp @@ -26,7 +26,7 @@ namespace CIDL_Sender_Impl char* Message_Impl::get_message () { - ACE_DEBUG ((LM_DEBUG, "Sender sending out message: [%s]\n", component_.message_.in ())); + ACE_DEBUG ((LM_EMERGENCY, "Sender sending out message: [%C]\n", component_.message_.in ())); return CORBA::string_dup (component_.message_.in ()); } @@ -50,7 +50,7 @@ namespace CIDL_Sender_Impl Sender_exec_i::hertz (CORBA::Long hertz) { this->hertz_ = hertz; - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::Hertz:%d\n", this->hertz_)); + ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::Hertz:%d\n", this->hertz_)); } CORBA::Long @@ -75,7 +75,7 @@ namespace CIDL_Sender_Impl Hello::CCM_ReadMessage_ptr Sender_exec_i::get_push_message () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "Sender_exec.i::get_push_message called\n ")); return ( new Message_Impl (*this) ); } @@ -85,31 +85,31 @@ namespace CIDL_Sender_Impl { Hello::TimeOut_var event = new OBV_Hello::TimeOut; event->data ("ACE/TAO/CIAO"); - ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n")); + ACE_DEBUG ((LM_EMERGENCY, "Sender initiates the process.\n")); this->context_->push_click_out (event.in ()); - ACE_DEBUG ((LM_DEBUG, "My current color is:")); + ACE_DEBUG ((LM_EMERGENCY, "My current color is:")); switch (this->color_) { case ::Hello::empty: - ACE_DEBUG ((LM_DEBUG, "ERROR: Enum attribute initialization failed.\n")); + ACE_DEBUG ((LM_EMERGENCY, "ERROR: Enum attribute initialization failed.\n")); break; case ::Hello::white: - ACE_DEBUG ((LM_DEBUG, "white\n")); + ACE_DEBUG ((LM_EMERGENCY, "white\n")); break; case ::Hello::red: - ACE_DEBUG ((LM_DEBUG, "red\n")); + ACE_DEBUG ((LM_EMERGENCY, "red\n")); break; case ::Hello::yellow: - ACE_DEBUG ((LM_DEBUG, "yellow\n")); + ACE_DEBUG ((LM_EMERGENCY, "yellow\n")); break; default: - ACE_DEBUG ((LM_DEBUG, "Unknown color!\n")); + ACE_DEBUG ((LM_EMERGENCY, "Unknown color!\n")); } } @@ -117,7 +117,7 @@ namespace CIDL_Sender_Impl void Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n")); + ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::set_session_context\n")); this->context_ = ::Hello::CCM_Sender_Context::_narrow (ctx); @@ -129,36 +129,29 @@ namespace CIDL_Sender_Impl } void - Sender_exec_i::ciao_preactivate () + Sender_exec_i::configuration_complete () { - ACE_DEBUG ((LM_DEBUG, - "Sender_exec_i::ciao_preactivate\n")); + ACE_DEBUG ((LM_EMERGENCY, + "Sender_exec_i::configuration_complete\n")); } void Sender_exec_i::ccm_activate () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_activate\n")); } void - Sender_exec_i::ciao_postactivate () - { - ACE_DEBUG ((LM_DEBUG, - "Sender_exec_i::ciao_postactivate\n")); - } - - void Sender_exec_i::ccm_passivate () { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_passivate\n")); + ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_passivate\n")); } void Sender_exec_i::ccm_remove () { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::ccm_remove\n")); + ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_remove\n")); } SenderHome_exec_i::SenderHome_exec_i () @@ -172,7 +165,7 @@ namespace CIDL_Sender_Impl ::Components::EnterpriseComponent_ptr SenderHome_exec_i::create () { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) creating SenderHome \n")); + ACE_DEBUG ((LM_EMERGENCY, "(%P|%t) creating SenderHome \n")); ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h index 1a3d186dfc5..cf68e2b689f 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.h +++ b/CIAO/examples/Hello/Sender/Sender_exec.h @@ -95,12 +95,10 @@ namespace CIDL_Sender_Impl // Operations from Components::SessionComponent virtual void set_session_context (::Components::SessionContext_ptr ctx); - virtual void ciao_preactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); - virtual void ciao_postactivate (); - virtual void ccm_passivate (); virtual void ccm_remove (); @@ -166,6 +164,9 @@ namespace CIDL_Sender_Impl create (); }; + extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Hello_Sender_Impl (void); + extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr create_Hello_SenderHome_Impl (void); } diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp index 1ce3ceced18..3900c541fc1 100644 --- a/CIAO/examples/Hello/Sender/starter.cpp +++ b/CIAO/examples/Hello/Sender/starter.cpp @@ -4,7 +4,7 @@ #include "ace/Get_Opt.h" // IOR file of the Sender -const char * ior = 0; +const ACE_TCHAR * ior = 0; const char * message = 0; int @@ -39,7 +39,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (ior == 0) { - ior = "file://Sender.ior"; + ior = ACE_TEXT("file://Sender.ior"); } return 0; diff --git a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp index 443ad7b0de3..8d22e0ea906 100644 --- a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp +++ b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp @@ -1,31 +1,181 @@ -<?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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> +<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 Deployment.xsd"> + <label>Hello_Deployment_1</label> + <UUID>Hello_Deployment_1</UUID> - <UUID>7A745844-C5AB-4402-8D3C-55B68A26B099</UUID> + <!-- Implementations declarations --> - <implementation id="_E91CFCB0-66F0-41A3-99CE-12AEDFACAC8E"> - <name>Hello.ComponentImplementations.ReceiverImplementation.ReceiverMonolithicImpl</name> + <!-- Home implementation --> + <implementation xmi:id="Hello_ReceiverHomeImplementation"> + <name>Hello_ReceiverHomeImplementation</name> <source/> - <artifact>_3D49EF00-0613-471E-A251-84263431CE61</artifact> - <artifact>_B1AD305F-9124-4C36-8502-C5878C6841C7</artifact> - <artifact>_6A3DCF45-7624-4AB1-95CA-A0DDF99053BB</artifact> + <artifact xmi:idref="Hello_Receiver_ExecArtifact" /> + <artifact xmi:idref="Hello_Receiver_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Hello_Receiver_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Hello_Receiver_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="Hello_ReceiverComponentImplementation"> + <name>Hello_ReceiverComponentImplementation</name> + <source/> + <artifact xmi:idref="Hello_Receiver_ExecArtifact" /> + <artifact xmi:idref="Hello_Receiver_SvntArtifact" /> + </implementation> + + <implementation xmi:id="Hello_SenderHomeImplementation"> + <name>Hello_SenderHomeImplementation</name> + <source/> + <artifact xmi:idref="Hello_Sender_ExecArtifact" /> + <artifact xmi:idref="Hello_Sender_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Hello_Sender_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Hello_Sender_exec</string> + </value> + </value> + </execParameter> </implementation> - <implementation id="_CE2EE8B8-BCF7-4E25-B3DB-0BFE5CED3A1C"> - <name>Hello.ComponentImplementations.SenderImplementation.SenderMonolithicImpl</name> + <implementation xmi:id="Hello_SenderComponentImplementation"> + <name>Hello_SenderComponentImplementation</name> <source/> - <artifact>_887DACE6-A0CD-4E0D-B84A-407B4FDB2D4A</artifact> - <artifact>_CB2D05F4-48C0-4567-9D59-534F461A81E7</artifact> - <artifact>_E2E0B980-BA79-43FB-AFC3-788B979E0413</artifact> + <artifact xmi:idref="Hello_Sender_ExecArtifact" /> + <artifact xmi:idref="Hello_Sender_SvntArtifact" /> </implementation> - <instance id="Hello.ComponentImplementations.Hello.Hello.Receiver"> - <name>Hello.ComponentImplementations.Hello.Hello.Receiver</name> + <instance xmi:id="Hello_ReceiverHomeInstance"> + <name>Hello_ReceiverHome</name> <node>ReceiverNode</node> + <!-- hostname --> <source/> - <implementation>_E91CFCB0-66F0-41A3-99CE-12AEDFACAC8E</implementation> + <implementation xmi:idref="Hello_ReceiverHomeImplementation" /> <configProperty> - <name>ComponentIOR</name> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ReceiverHome.ior</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ReceiverHome</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="Hello_ReceiverComponentInstance"> + <name>Hello_ReceiverComponent</name> + <node>ReceiverNode</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Hello_ReceiverComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Hello_ReceiverHome</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> <value> <type> <kind>tk_string</kind> @@ -36,7 +186,7 @@ </value> </configProperty> <configProperty> - <name>RegisterNaming</name> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> <value> <type> <kind>tk_string</kind> @@ -48,30 +198,50 @@ </configProperty> </instance> - <instance id="Hello.ComponentImplementations.Hello.Hello.Sender"> - <name>Hello.ComponentImplementations.Hello.Hello.Sender</name> + <instance xmi:id="Hello_SenderHomeInstance"> + <name>Hello_SenderHome</name> <node>SenderNode</node> + <!-- hostname --> <source/> - <implementation>_CE2EE8B8-BCF7-4E25-B3DB-0BFE5CED3A1C</implementation> + <implementation xmi:idref="Hello_SenderHomeImplementation" /> <configProperty> - <name>ComponentIOR</name> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> <value> <type> <kind>tk_string</kind> </type> <value> - <string>Sender.ior</string> + <string>SenderHome.ior</string> </value> </value> </configProperty> <configProperty> - <name>RegisterNaming</name> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> <value> <type> <kind>tk_string</kind> </type> <value> - <string>Sender</string> + <string>SenderHome</string> + </value> + </value> + </configProperty> + </instance> + + <instance xmi:id="Hello_SenderComponentInstance"> + <name>Hello_SenderComponent</name> + <node>SenderNode</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Hello_SenderComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Hello_SenderHome</string> </value> </value> </configProperty> @@ -105,120 +275,87 @@ </value> </value> </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + <configProperty> + <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender</string> + </value> + </value> + </configProperty> </instance> - + <connection> - <name>read_message_push_messageHello.ComponentImplementations.Hello.Hello.ReceiverHello.ComponentImplementations.Hello.Hello.Sender</name> + <name>MessageConnection</name> <internalEndpoint> <portName>read_message</portName> + <provider>false</provider> <kind>SimplexReceptacle</kind> - <instance>Hello.ComponentImplementations.Hello.Hello.Receiver</instance> + <instance xmi:idref="Hello_ReceiverComponentInstance" /> </internalEndpoint> <internalEndpoint> <portName>push_message</portName> + <provider>true</provider> <kind>Facet</kind> - <instance>Hello.ComponentImplementations.Hello.Hello.Sender</instance> + <instance xmi:idref="Hello_SenderComponentInstance" /> </internalEndpoint> </connection> <connection> - <name>click_out_click_inHello.ComponentImplementations.Hello.Hello.SenderHello.ComponentImplementations.Hello.Hello.Receiver</name> + <name>EventConnection</name> <internalEndpoint> <portName>click_out</portName> + <provider>false</provider> <kind>EventPublisher</kind> - <instance>Hello.ComponentImplementations.Hello.Hello.Sender</instance> + <instance xmi:idref="Hello_SenderComponentInstance" /> </internalEndpoint> <internalEndpoint> <portName>click_in</portName> + <provider>true</provider> <kind>EventConsumer</kind> - <instance>Hello.ComponentImplementations.Hello.Hello.Receiver</instance> + <instance xmi:idref="Hello_ReceiverComponentInstance" /> </internalEndpoint> </connection> - <artifact id="_3D49EF00-0613-471E-A251-84263431CE61"> - <name>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_stub</name> + <!-- Artifacts declarations --> + <artifact xmi:id="Hello_Receiver_ExecArtifact"> + <name>Hello_Receiver_exec</name> <source/> <node/> - <location>Hello_Receiver_stub</location> + <location>Hello_Receiver_exec</location> </artifact> - - <artifact id="_B1AD305F-9124-4C36-8502-C5878C6841C7"> - <name>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name> + <artifact xmi:id="Hello_Receiver_SvntArtifact"> + <name>Hello_Receiver_svnt</name> <source/> <node/> <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> </artifact> - <artifact id="_6A3DCF45-7624-4AB1-95CA-A0DDF99053BB"> - <name>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name> + <artifact xmi:id="Hello_Sender_ExecArtifact"> + <name>Hello_Sender_exec</name> <source/> <node/> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="_887DACE6-A0CD-4E0D-B84A-407B4FDB2D4A"> - <name>Hello.ImplementationArtifacts.SenderArtifacts.Sender_stub</name> - <source/> - <node/> - <location>Hello_Sender_stub</location> + <location>Hello_Sender_exec</location> </artifact> - - <artifact id="_CB2D05F4-48C0-4567-9D59-534F461A81E7"> - <name>Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name> + <artifact xmi:id="Hello_Sender_SvntArtifact"> + <name>Hello_Sender_svnt</name> <source/> <node/> <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="_E2E0B980-BA79-43FB-AFC3-788B979E0413"> - <name>Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec</name> - <source/> - <node/> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> </artifact> -</Deployment:deploymentPlan> +</Deployment:DeploymentPlan> diff --git a/CIAO/examples/Hello/descriptors/Hello.cid b/CIAO/examples/Hello/descriptors/Hello.cid deleted file mode 100644 index f7abad71ded..00000000000 --- a/CIAO/examples/Hello/descriptors/Hello.cid +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - 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 Deployment.xsd"> - <label>Hello Example Assembly</label> - <UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID> - <assemblyImpl> - <instance xmi:id="a_Sender"> - <name>Sender_Instance</name> - <package href="Sender.cpd"/> - - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <configProperty> - <name>hertz</name> - <value> - <type> - <kind>tk_long</kind> - </type> - <value> - <long>50</long> - </value> - </value> - </configProperty> - </instance> - - <!-- ***************************** --> - - <instance xmi:id="a_Receiver"> - <name>Receiver_Instance</name> - <package href="Receiver.cpd"/> - - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - <connection> - <name>Messages</name> - <internalEndpoint> - <portName>read_message</portName> - <instance xmi:idref="a_Receiver"/> - </internalEndpoint> - <internalEndpoint> - <portName>push_message</portName> - <instance xmi:idref="a_Sender"/> - </internalEndpoint> - </connection> - <connection> - <name>Events</name> - <internalEndpoint> - <portName>click_in</portName> - <instance xmi:idref="a_Receiver"/> - </internalEndpoint> - <internalEndpoint> - <portName>click_out</portName> - <instance xmi:idref="a_Sender"/> - </internalEndpoint> - </connection> - </assemblyImpl> -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Hello/descriptors/Hello.cpd b/CIAO/examples/Hello/descriptors/Hello.cpd deleted file mode 100644 index 52b0e9a6c1d..00000000000 --- a/CIAO/examples/Hello/descriptors/Hello.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - 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 Deployment.xsd"> - <label>Hello Example Package</label> - <UUID>823e4287-f53c-4caa-8619-f3dfda4c4998</UUID> - <implementation> - <name>Hello</name> - <referencedImplementation href="Hello.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Hello/descriptors/Libraries.iad b/CIAO/examples/Hello/descriptors/Libraries.iad deleted file mode 100644 index 6112a23ca3b..00000000000 --- a/CIAO/examples/Hello/descriptors/Libraries.iad +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription 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 Deployment.xsd"> - <label>Common Libraries</label> - <UUID>6bae4fcd-c71c-44b4-a0d4-0e4199ce1a49</UUID> - <location>$ACE_ROOT/lib/libACE</location> - <location>$ACE_ROOT/lib/libTAO</location> - <location>$ACE_ROOT/lib/libCIAO_DnC_Client</location> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/NodeManagerMap.dat b/CIAO/examples/Hello/descriptors/NodeManagerMap.dat index 9880f37997e..69199c0a089 100644 --- a/CIAO/examples/Hello/descriptors/NodeManagerMap.dat +++ b/CIAO/examples/Hello/descriptors/NodeManagerMap.dat @@ -1,2 +1,2 @@ -SenderNode corbaloc:iiop:localhost:60001/NodeManager -ReceiverNode corbaloc:iiop:localhost:60002/NodeManager
\ No newline at end of file +SenderNode corbaloc:iiop:localhost:60001/Sender.NodeManager +ReceiverNode corbaloc:iiop:localhost:60002/Receiver.NodeManager
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors/Receiver.ccd b/CIAO/examples/Hello/descriptors/Receiver.ccd deleted file mode 100644 index a5167d03e7a..00000000000 --- a/CIAO/examples/Hello/descriptors/Receiver.ccd +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription - 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 Deployment.xsd"> - <label>Receiver Component </label> - <UUID>589462ed-e88f-4f96-a7a7-359cdc333d63</UUID> - <specificType>IDL:Hello/Receiver:1.0</specificType> - <supportedType>IDL:Hello/Receiver:1.0</supportedType> - <idlFile>Receiver.idl</idlFile> - <port> - <name>click_in</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <supportedType>IDL:Hello/TimeOut:1.0</supportedType> - <specificType>IDL:Hello/TimeOut:1.0</specificType> - <kind>EventConsumer</kind> - </port> - - <port> - <name>read_message</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>false</provider> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <kind>SimplexReceptacle</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/CIAO/examples/Hello/descriptors/Receiver.cid b/CIAO/examples/Hello/descriptors/Receiver.cid deleted file mode 100644 index 18d379e7eba..00000000000 --- a/CIAO/examples/Hello/descriptors/Receiver.cid +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - 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 Deployment.xsd"> - <label>Receiver Implementation</label> - <UUID>0a52c9de-7852-42e4-aac7-bf478169a21a</UUID> - <implements href="Receiver.ccd"/> - <monolithicImpl> - <primaryArtifact> - <name>Receiver_Stub</name> - <referencedArtifact href="Receiver_Stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Receiver_Svnt</name> - <referencedArtifact href="Receiver_Svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Receiver_Exec</name> - <referencedArtifact href="Receiver_Exec.iad"/> - </primaryArtifact> - </monolithicImpl> -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Hello/descriptors/Receiver.cpd b/CIAO/examples/Hello/descriptors/Receiver.cpd deleted file mode 100644 index 3cddb924834..00000000000 --- a/CIAO/examples/Hello/descriptors/Receiver.cpd +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - 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 Deployment.xsd"> - <label>Receiver Package</label> - <UUID>a5923ef4-9c62-4458-9fa4-869b53d834ca</UUID> - <realizes href="Receiver.ccd"/> - <implementation> - <name>Receiver</name> - <referencedImplementation href="Receiver.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Hello/descriptors/Receiver_Exec.iad b/CIAO/examples/Hello/descriptors/Receiver_Exec.iad deleted file mode 100644 index f039e8cd68b..00000000000 --- a/CIAO/examples/Hello/descriptors/Receiver_Exec.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - 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 Deployment.xsd"> - <label>Receiver Executor Artifact</label> - <UUID>412f8156-7913-4651-9110-f7a3f98c7a83</UUID> - <location>Hello_Receiver_exec</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>Receiver_Stub</name> - <referencedArtifact href="Receiver_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/Receiver_Stub.iad b/CIAO/examples/Hello/descriptors/Receiver_Stub.iad deleted file mode 100644 index f226d9b0d92..00000000000 --- a/CIAO/examples/Hello/descriptors/Receiver_Stub.iad +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - 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 Deployment.xsd"> - <label>Receiver Stub Artifact</label> - <UUID>4d02c22b-768e-4d1a-bf07-76da2f5d1fbf</UUID> - <location>Hello_Receiver_stub</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad b/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad deleted file mode 100644 index 535ccf10d8d..00000000000 --- a/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - 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 Deployment.xsd"> - <label>Receiver Servant Artifact</label> - <UUID>ad052b10-0806-43c7-9ccc-2dfeda0e0e03</UUID> - <location>Hello_Receiver_svnt</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>Receiver_Stub</name> - <referencedArtifact href="Receiver_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/Sender.ccd b/CIAO/examples/Hello/descriptors/Sender.ccd deleted file mode 100644 index cf07fe0ef75..00000000000 --- a/CIAO/examples/Hello/descriptors/Sender.ccd +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription - 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 Deployment.xsd"> - - <label>Sender Component</label> - <UUID>803f8fc7-55de-4a20-81eb-ae951d85b7f4</UUID> - <specificType>IDL:Hello/Sender:1.0</specificType> - <supportedType>IDL:Hello/Sender:1.0</supportedType> - <property> - <name>local_message</name> - <type> - <kind>tk_string</kind> - </type> - </property> - <port> - <name>supports</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:Hello/trigger:1.0</supportedType> - <kind>Facet</kind> - </port> - <port> - <name>click_out</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:Hello/TimeOut:1.0</supportedType> - <specificType>IDL:Hello/TimeOut:1.0</specificType> - <kind>EventPublisher</kind> - </port> - <port> - <name>push_message</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/CIAO/examples/Hello/descriptors/Sender.cid b/CIAO/examples/Hello/descriptors/Sender.cid deleted file mode 100644 index c6e02fc2d25..00000000000 --- a/CIAO/examples/Hello/descriptors/Sender.cid +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription - 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 Deployment.xsd"> - <label>Sender Implementation</label> - <UUID>789e1be2-703f-4bd3-af50-b400eef91fd0</UUID> - <implements href="Sender.ccd"/> - <monolithicImpl> - <primaryArtifact> - <name>Sender_Stub</name> - <referencedArtifact href="Sender_Stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Sender_Svnt</name> - <referencedArtifact href="Sender_Svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Sender_Exec</name> - <referencedArtifact href="Sender_Exec.iad"/> - </primaryArtifact> - </monolithicImpl> -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Hello/descriptors/Sender.cpd b/CIAO/examples/Hello/descriptors/Sender.cpd deleted file mode 100644 index df2c441be3f..00000000000 --- a/CIAO/examples/Hello/descriptors/Sender.cpd +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription - 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 Deployment.xsd"> - <label>Sender Package</label> - <UUID>07ebf947-2174-4a3b-bd37-bcb92986eaf4</UUID> - <realizes href="Sender.ccd"/> - <implementation> - <name>Sender</name> - <referencedImplementation href="Sender.cid"/> - </implementation> -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Hello/descriptors/Sender_Exec.iad b/CIAO/examples/Hello/descriptors/Sender_Exec.iad deleted file mode 100644 index a5d70fe8504..00000000000 --- a/CIAO/examples/Hello/descriptors/Sender_Exec.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - 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 Deployment.xsd"> - <label>Sender Executor Artifact</label> - <UUID>5e4f2366-3810-4d4c-a269-5788a525cbe1</UUID> - <location>Hello_Sender_exec</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>Sender_Stub</name> - <referencedArtifact href="Sender_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/Sender_Stub.iad b/CIAO/examples/Hello/descriptors/Sender_Stub.iad deleted file mode 100644 index 13c28534aaf..00000000000 --- a/CIAO/examples/Hello/descriptors/Sender_Stub.iad +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - 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 Deployment.xsd"> - <label>Sender Stub Artifact</label> - <UUID>93bbdf7d-d3f7-4227-bb75-b0562ac15b92</UUID> - <location>Hello_Sender_stub</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/Sender_Svnt.iad b/CIAO/examples/Hello/descriptors/Sender_Svnt.iad deleted file mode 100644 index dd4a6f02027..00000000000 --- a/CIAO/examples/Hello/descriptors/Sender_Svnt.iad +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription - 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 Deployment.xsd"> - <label>Sender Servant Artifact</label> - <UUID>04e4d246-e6eb-4b0e-8e32-60b996497cea</UUID> - <location>Hello_Receiver_svnt</location> - <dependsOn> - <name>ACE</name> - <referencedArtifact href="Libraries.iad"/> - </dependsOn> - <dependsOn> - <name>Sender_Stub</name> - <referencedArtifact href="Sender_Stub.iad"/> - </dependsOn> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl index a3df657cab1..81811665eff 100755 --- a/CIAO/examples/Hello/descriptors/run_test.pl +++ b/CIAO/examples/Hello/descriptors/run_test.pl @@ -17,6 +17,7 @@ $ns_running = 0; $daemons = 2; @ports = ( 60001, 60002 ); @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" ); +@nodenames = ( "Sender", "Receiver" ); $status = 0; $dat_file = "NodeManagerMap.dat"; $cdp_file = "DeploymentPlan.cdp"; @@ -69,21 +70,21 @@ sub run_node_daemons { { $iorfile = $iorfiles[$i]; $port = $ports[$i]; - + $nodename = $nodenames[$i]; $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/NodeApplication"; + $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; - $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30"; + $d_cmd = "$DAnCE/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --instance-nc corbaloc:rir:/NameService"; $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); $result = $Daemons[$i]->Spawn (); push(@processes, $Daemons[$i]); if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { + 30) == -1) { print STDERR - "ERROR: The ior file of node daemon $i could not be found\n"; + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; for (; $i >= 0; --$i) { $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); } @@ -130,12 +131,12 @@ $daemons_running = 1; # Invoke execution manager. print "Invoking execution manager\n"; -$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager", - "-o EM.ior -i $dat_file"); +$EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager", + "-eEM.ior --node-map $dat_file"); $EM->Spawn (); if (PerlACE::waitforfile_timed ("EM.ior", - $PerlACE::wait_interval_for_process_creation) == -1) { + $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; kill_open_processes (); @@ -147,8 +148,8 @@ $em_running = 1; # Invoke executor - start the application -. print "Invoking executor - start the application -\n"; $E = - new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", - "-p DeploymentPlan.cdp -k file://EM.ior -o DAM.ior"); + new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher", + "-x DeploymentPlan.cdp -k file://EM.ior"); $E->SpawnWaitKill (5000); @@ -179,8 +180,8 @@ if ($result != 0) { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; $E = - new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", - "-k file://EM.ior -i file://DAM.ior"); + new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher", + "-k file://EM.ior -x DeploymentPlan.cdp -q"); $E->SpawnWaitKill (3000); print "Executor returned.\n"; diff --git a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp deleted file mode 100644 index 083484ca185..00000000000 --- a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp +++ /dev/null @@ -1,222 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp deleted file mode 100644 index af8f50026e8..00000000000 --- a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp +++ /dev/null @@ -1,267 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd-UPDATE-XXXXXXXX"> - <name>Hello-Receiver-idd-UPDATE-XXXXXXXXX</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver_2.ior</string> - </value> - </value> - </configProperty> - </instance> - - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <connection> - <name>hello_event_connection_new</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd-UPDATE-XXXXXXXX</instance> - </internalEndpoint> - </connection> - - <connection> - <name>hello_facet_connection_new</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd-UPDATE-XXXXXXXX</instance> - </internalEndpoint> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp b/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp deleted file mode 100644 index 79cc923d154..00000000000 --- a/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp +++ /dev/null @@ -1,223 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - - <instance id="Hello-Receiver-idd-UPDATE-XXXXXXXX"> - <name>Hello-Receiver-idd-UPDATE-XXXXXXXXX</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver_2.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_event_connection_new</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd-UPDATE-XXXXXXXX</instance> - </internalEndpoint> - </connection> - - <connection> - <name>hello_facet_connection_new</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd-UPDATE-XXXXXXXX</instance> - </internalEndpoint> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/NodeManagerMap.dat b/CIAO/examples/Hello/descriptors_events/NodeManagerMap.dat deleted file mode 100644 index 9880f37997e..00000000000 --- a/CIAO/examples/Hello/descriptors_events/NodeManagerMap.dat +++ /dev/null @@ -1,2 +0,0 @@ -SenderNode corbaloc:iiop:localhost:60001/NodeManager -ReceiverNode corbaloc:iiop:localhost:60002/NodeManager
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat b/CIAO/examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat deleted file mode 100644 index 54066c67ce0..00000000000 --- a/CIAO/examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat +++ /dev/null @@ -1,2 +0,0 @@ -SenderNode corbaloc:iiop:localhost:60001/NodeManager -ReceiverNode corbaloc:iiop:129.59.129.181:60002/NodeManager
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors_events/NodeManagerMap_collocated.dat b/CIAO/examples/Hello/descriptors_events/NodeManagerMap_collocated.dat deleted file mode 100644 index 3aa4d0922e0..00000000000 --- a/CIAO/examples/Hello/descriptors_events/NodeManagerMap_collocated.dat +++ /dev/null @@ -1 +0,0 @@ -SenderNode corbaloc:iiop:localhost:60001/NodeManager diff --git a/CIAO/examples/Hello/descriptors_events/README b/CIAO/examples/Hello/descriptors_events/README deleted file mode 100644 index 924893bbf2c..00000000000 --- a/CIAO/examples/Hello/descriptors_events/README +++ /dev/null @@ -1,145 +0,0 @@ -Event Descriptors for Hello Example -=================================== - -This folder contains several deployemnts to demonstrate and test the -functionality of rt event channel integration into CIAO/DAnCE. -Please see $CIAO_ROOT/docs/schema/CIAOEvents.txt for a detailed description -how to configure descriptor files accordingly. - -The rest of this file describes the rule of the files in this directory. - -single files and their role: ----------------------------- - -./run_test.pl : script that executes all available tests - -./run_NodeDaemons.pl : script to launch two empty NodeApplications -./run_NodeDaemons_svc_conf.pl : starts two node NodeApplications on the - localhost interface and loads rtec.conf on - startup -./run_NodeDaemons_with_ip.pl : starts two node NodeApplications under the - IP address and not on the localhost interface - -./NodeManagerMap.dat : contains ip addresses for SenderNode and - ReceiverNode (both on localhost) -./NodeManagerMap_collocated.dat : contains an ip address for a single - SenderNode (on localhost) -./NodeManagerMapTwoHosts.dat : contains ip addresses for SenderNode - (on localhost) and ReceiverNode - (on real ip address) - -./rtec.conf : example for a service configurator file - for the event service - - -existing test cases: --------------------- - -./ciao-events-example.ced -./deploymentplan_events.cdp -./run_test_simple.pl - - Uses the standard event service and connects one sender to one - receiver. In the standard configuration, used here, the EventChannel - is running collocated within the NodeApplication "SenderNode", where - the sender component is located: - SenderNode[Sender --> ES] --> ReceiverNode[Receiver] - -./ciao-events-example-collocated.ced -./deploymentplan_events_collocated.cdp -./run_test_collocated.pl: - - This example modifies the standard example by deploying all components - within one node: - SenderNode[Sender --> ES --> Receiver] - -./ciao-events-example-with-federation.ced -./deploymentplan_federation.cdp -./run_test_federated.pl: - - In this example, two Event Services ES_01 and ES_02 are federated. - The Sender Event Port is then connected to the first service, while - the Receiver gets its events from the second service. - All entities are collocated in one node process: - SenderNode[Sender --> ES_01 --> ES_02 --> Receiver] - - (problem: - Receiver - Informed by the Sender with message [ACE/TAO/CIAO] - CORBA EXCEPTION caught - (27698|3072210624) EXCEPTION, RTEventServiceConsumer_impl::push() - - system exception, ID 'IDL:omg.org/CORBA/BAD_INV_ORDER:1.0' - Unknown vendor minor code id (0), minor code = 0, completed = NO - ) - -./ciao-events-example-with-filters.ced -./deploymentplan_with_filters.cdp -./run_test_filtered.pl: - - This example applies a filter to the EventService connection on the - receiver side. In this case the filter contains a disjunction group - of two sender component sources. - SenderNode[Sender --> ES -{Filter}-> Receiver] - -./ciao-events-federation-mcast.ced -./deploymentplan_federation_mcast.cdp -./run_test_multicast.pl: - - To test collocated use of multicast federation of event channels - use this example. It deploys sender and receiver in the same - node and connects them through two eventchannels, using udp - multicast to communicate: - SenderNode[Sender --> ES_01 --> udp_sender -UDP{224.9.9.2:1234}-> - udp_mcast_receiver --> ES_02 --> Receiver] - - - (unresolved failure: - Create a receiver object with addr_serv_id: addr_serv_1 - (20850|3072210624) EXCEPTION, NodeApplication_Impl::finishLaunch - - system exception, ID 'IDL:omg.org/CORBA/UNKNOWN:1.0' - OMG minor code (1), described as 'Unlisted user exception received by c - lient.', completed = MAYBE - ) - -./ciao-events-federation-udp.ced -./deploymentplan_federation_udp.cdp -./run_test_udp.pl: - - In this example, udp communication is used to send the event - from one sender node to a receiver node: - SenderNode[Sender --> ES --> udp_sender] -UDP{localhost:1234}-> - ReceiverNode[udp_receiver --> ES_02 --> Receiver] - -./ciao-events-federation-udp-collocated.ced -./deploymentplan_federation_udp_collocated.cdp -./run_test_udp_collocated.pl: - - Same example, as the above udp example, but deployed on a - single node application and therefore collocated: - SenderNode[Sender --> ES_01 --> udp_sender -UDP{localhost:1234}-> - udp_receiver --> ES_02 --> Receiver] - -./ciao-events-federation-udp-two-hosts.ced -./deploymentplan_federation_udp_two_hosts.cdp - - this test is not yet automated, because the nodes are - supposed to be deployed on two different host machines: - SenderNode[Sender --> ES_01 --> udp_sender] - -UDP{129.59.129.181:1234}-> - ReceiverNode[udp_receiver --> ES_02 --> ReceiverNode] - -./ciao-events-example.ced -./deploymentplan_multiple_senders.cdp -./run_test_multiple_senders.pl: - - This example extends the standard example by adding two more sender - components to the SenderNode: - [Sender01 --> ] - SenderNode[Sender02 --> ES ] --> ReceiverNode[Receiver] - [Sender03 --> ] - - ------- - -author: Friedhelm Wolf (fwolf@dre.vanderbilt.edu) diff --git a/CIAO/examples/Hello/descriptors_events/RunEventTest.pm b/CIAO/examples/Hello/descriptors_events/RunEventTest.pm deleted file mode 100755 index 615cc0ee317..00000000000 --- a/CIAO/examples/Hello/descriptors_events/RunEventTest.pm +++ /dev/null @@ -1,212 +0,0 @@ -# $Id$ -# -*- perl -*- - -package RunEventTest; - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::Run_Test; - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; -$status = 0; -$dat_file = "NodeManagerMap.dat"; -$cdp_file = "flattened_deploymentplan_events.cdp"; -$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; -$sender_ior = "Sender.ior"; -$receiver_ior = "Receiver.ior"; -$nodes; -$E = 0; -$EM = 0; - -$nsior = PerlACE::LocalFile ("ns.ior"); -unlink $nsior; - -sub parse_dat_file { - my $node_list; # array of hashes, containing node info - my $lines = 0; - - # read .dat file and parse it for node name, ip and port - open (my $fh, @_[0]) or die "could not open @_[0]"; - while(<$fh>) { - if (m{(\w+)\s+corbaloc:iiop:(\w*):([0-9]*)/NodeManager}) { - # store the three values in the according row - # of the array of hashest - $node_list->[$lines]->{"node"} = $1; - $node_list->[$lines]->{"ip"} = $2; - $node_list->[$lines++]->{"port"} = $3; - } - } - close ($fh) or die "could not close @_[0]"; - - return $node_list; -} - -# Delete if there are any .ior files. -sub delete_ior_files { - for ($i = 0; $i < scalar(@$nodes); ++$i) { - unlink $nodes->[$i]->{"node"} . ".ior"; - } - unlink PerlACE::LocalFile ("EM.ior"); - unlink PerlACE::LocalFile ($receiver_ior); - unlink PerlACE::LocalFile ($sender_ior); - unlink PerlACE::LocalFile ("DAM.ior"); - unlink PerlACE::LocalFile ("ns.ior"); -} - -sub kill_node_daemons { - for ($i = 0; $i < scalar(@$nodes); ++$i) { - $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); - } -} - -sub kill_open_processes { - if ($daemons_running == 1) { - kill_node_daemons (); - } - - if ($em_running == 1) { - $EM->Kill (); - $EM->TimedWait (1); - } - - if ($ns_running == 1) { - $NS->Kill (); - $NS->TimedWait (1); - } - -} - -sub run_node_daemons { - for ($i = 0; $i < scalar(@$nodes); ++$i) - { - $iorfile = $nodes->[$i]->{"node"} . ".ior"; - $iiop = "iiop://" . $nodes->[$i]->{"ip"} . ":" . $nodes->[$i]->{"port"}; - $node_app = "$CIAO_ROOT/bin/NodeApplication"; - - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; - $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30"; - - print $d_cmd . " " . $d_param . "\n"; - $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); - $result = $Daemons[$i]->Spawn (); - push(@processes, $Daemons[$i]); - - if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR - "ERROR: The ior file of node daemon $i could not be found\n"; - for (; $i >= 0; --$i) { - $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); - } - return -1; - } - } - return 0; -} - - -sub run_test { - # first argument will be interpreted as .cdp file - $cdp_file = shift; - # second argument will be interpreted as .dat file - $dat_file = shift; - - $nodes = parse_dat_file ($dat_file); - - delete_ior_files (); - - # Invoke naming service - $NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior"); - $NS->Spawn (); - - print STDERR "Starting Naming Service\n"; - - if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1){ - print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); - return 1; - } - - $ns_running = 1; - - # Invoke node daemons. - print "Invoking node daemons\n"; - $status = run_node_daemons (); - - if ($status != 0) { - print STDERR "ERROR: Unable to execute the node daemons\n"; - kill_open_processes (); - return 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager", - "-o EM.ior -i $dat_file"); - $EM->Spawn (); - - 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 (); - return 1; - } - - $em_running = 1; - - # Invoke executor - start the application -. - print "Invoking executor - start the application -\n"; - $E = - new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", - "-p $cdp_file -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 (); - return 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 (); - return 1; - } - - print "Invoking the controller\n"; - $controller = new PerlACE::Process ("$controller_exec", "-k file://$sender_ior"); - $result = $controller->SpawnWaitKill (3000); - - if ($result != 0) { - print STDERR "ERROR: The controller returned $result\n"; - $status = 1; - } - - # Invoke executor - stop the application -. - print "Invoking executor - stop the application -\n"; - $E = - new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", - "-k file://EM.ior -i file://DAM.ior"); - $E->SpawnWaitKill (3000); - - print "Executor returned.\n"; - print "Shutting down rest of the processes.\n"; - - delete_ior_files (); - kill_open_processes (); - - return $status; -} - -1; diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced deleted file mode 100644 index 1166a034caf..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-example-collocated.ced +++ /dev/null @@ -1,14 +0,0 @@ -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>svc.conf</svc_cfg_file> - </eventServiceConfiguration> - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-federation.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-federation.ced deleted file mode 100644 index 930439f44d5..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-federation.ced +++ /dev/null @@ -1,48 +0,0 @@ -<!-- $ID$ --> - -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <!-- The remote EC's host name and port # --> - <addr_serv> - <name>addr_serv_0</name> - <port>1234</port> - <address>localhost</address> - </addr_serv> - - <udp_sender> - <name>upd_sender_1</name> - <addr_serv_id>addr_serv_0</addr_serv_id> - </udp_sender> - </eventServiceConfiguration> - - - <eventServiceConfiguration id="es_configuration-02"> - <name>ES_02</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <addr_serv> - <name>addr_serv_1</name> - <port>1234</port> - <address>localhost</address> - </addr_serv> - <udp_receiver> - <name>upd_receiver_1</name> - <addr_serv_id>addr_serv_1</addr_serv_id> - <is_multicast>false</is_multicast> - <listen_port>1234</listen_port> - </udp_receiver> - </eventServiceConfiguration> - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced deleted file mode 100644 index affc0e49dc7..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced +++ /dev/null @@ -1,51 +0,0 @@ -<!-- $ID$ --> - -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>svc.conf</svc_cfg_file> - - <filter> - <name>my_filter_01</name> - <type>DISJUNCTION</type> - <source>Hello-Sender-idd_click_out</source> - <source>Hello-Sender-idd-02_click_out</source> - </filter> - - <filter> - <name>my_filter_02</name> - <type>DISJUNCTION</type> - <source>Hello-Sender-idd_click_out</source> - </filter> - - <filter> - <name>my_filter_03</name> - <type>CONJUNCTION</type> - <source>Hello-Sender-idd_click_out</source> - <source>Hello-Sender-idd-02_click_out</source> - </filter> - - <filter> - <name>my_filter_04</name> - <type>CONJUNCTION</type> - <source>Hello-Sender-idd_click_out</source> - </filter> - - - </eventServiceConfiguration> - - <eventServiceConfiguration id="es_configuration-02"> - <name>ES_02</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>svc.conf</svc_cfg_file> - </eventServiceConfiguration> - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced deleted file mode 100644 index 1166a034caf..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced +++ /dev/null @@ -1,14 +0,0 @@ -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>svc.conf</svc_cfg_file> - </eventServiceConfiguration> - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-mcast.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-federation-mcast.ced deleted file mode 100644 index 9fa450602ba..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-mcast.ced +++ /dev/null @@ -1,58 +0,0 @@ -<!-- $ID$ --> - -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <filter> - <name>my_filter</name> - <type>DISJUNCTION</type> - <source>Hello-Sender-idd_click_out</source> - </filter> - - <!-- The remote EC's host name and port # --> - <addr_serv> - <name>addr_serv_0</name> - <port>1234</port> - <address>224.9.9.2</address> - </addr_serv> - - <udp_sender> - <name>upd_sender_1</name> - <addr_serv_id>addr_serv_0</addr_serv_id> - </udp_sender> - </eventServiceConfiguration> - - - - <eventServiceConfiguration id="es_configuration-02"> - <name>ES_02</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <addr_serv> - <name>addr_serv_1</name> - <port>1234</port> - <address>224.9.9.2</address> - </addr_serv> - <udp_receiver> - <name>upd_receiver_1</name> - <addr_serv_id>addr_serv_1</addr_serv_id> - <is_multicast>true</is_multicast> - - <!-- Listen port for this EC's event handler --> - <listen_port>1234</listen_port> - </udp_receiver> - </eventServiceConfiguration> - - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced deleted file mode 100644 index 89e85b5b21d..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced +++ /dev/null @@ -1,47 +0,0 @@ -<!-- $ID$ --> - -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <!-- The remote EC's host name and port # --> - <addr_serv> - <name>addr_serv_0</name> - <port>1234</port> - <address>localhost</address> - </addr_serv> - - <udp_sender> - <name>upd_sender_1</name> - <addr_serv_id>addr_serv_0</addr_serv_id> - </udp_sender> - </eventServiceConfiguration> - - <eventServiceConfiguration id="es_configuration-02"> - <name>ES_02</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <addr_serv> - <name>addr_serv_1</name> - <port>1234</port> - <address>localhost</address> - </addr_serv> - <udp_receiver> - <name>upd_receiver_1</name> - <addr_serv_id>addr_serv_1</addr_serv_id> - <is_multicast>false</is_multicast> - <listen_port>1234</listen_port> - </udp_receiver> - </eventServiceConfiguration> - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced deleted file mode 100644 index 5f65ab8375f..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced +++ /dev/null @@ -1,50 +0,0 @@ -<!-- $ID$ --> - -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <!-- Assume the ES_01 will be deployed on node tango.dre.vanderbilt.edu --> - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <!-- The remote EC's host name and port # --> - <addr_serv> - <name>addr_serv_0</name> - <port>1234</port> - <address>129.59.129.181</address> - </addr_serv> - - <udp_sender> - <name>upd_sender_1</name> - <addr_serv_id>addr_serv_0</addr_serv_id> - </udp_sender> - </eventServiceConfiguration> - - - <!-- Assume the ES_02 will be deployed on node pacific.dre.vanderbilt.edu --> - <eventServiceConfiguration id="es_configuration-02"> - <name>ES_02</name> - <node>ReceiverNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <addr_serv> - <name>addr_serv_1</name> - <port>1234</port> - <address>129.59.129.181</address> - </addr_serv> - <udp_receiver> - <name>upd_receiver_1</name> - <addr_serv_id>addr_serv_1</addr_serv_id> - <is_multicast>false</is_multicast> - <listen_port>1234</listen_port> - </udp_receiver> - </eventServiceConfiguration> - -</CIAO:CIAOEvents>
\ No newline at end of file diff --git a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp.ced b/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp.ced deleted file mode 100644 index 3d2a9d3fbb4..00000000000 --- a/CIAO/examples/Hello/descriptors_events/ciao-events-federation-udp.ced +++ /dev/null @@ -1,49 +0,0 @@ -<!-- $ID$ --> - -<CIAO:CIAOEvents - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd"> - - <eventServiceConfiguration id="es_configuration-01"> - <name>ES_01</name> - <node>SenderNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <!-- The remote EC's host name and port # --> - <addr_serv> - <name>addr_serv_0</name> - <port>1234</port> - <address>localhost</address> - </addr_serv> - - <udp_sender> - <name>upd_sender_1</name> - <addr_serv_id>addr_serv_0</addr_serv_id> - </udp_sender> - </eventServiceConfiguration> - - - - <eventServiceConfiguration id="es_configuration-02"> - <name>ES_02</name> - <node>ReceiverNode</node> - <type>RTEC</type> - <svc_cfg_file>dummy.conf</svc_cfg_file> - - <addr_serv> - <name>addr_serv_1</name> - <port>1234</port> - <address>localhost</address> - </addr_serv> - <udp_receiver> - <name>upd_receiver_1</name> - <addr_serv_id>addr_serv_1</addr_serv_id> - <is_multicast>false</is_multicast> - <listen_port>1234</listen_port> - </udp_receiver> - </eventServiceConfiguration> - -</CIAO:CIAOEvents> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_events.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_events.cdp deleted file mode 100644 index a64e501402f..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_events.cdp +++ /dev/null @@ -1,260 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - -<!-- - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> ---> - - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Hello_Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Hello_Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-example.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_events_collocated.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_events_collocated.cdp deleted file mode 100644 index 79796d9177b..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_events_collocated.cdp +++ /dev/null @@ -1,260 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - -<!-- - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> ---> - - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-example-collocated.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation.cdp deleted file mode 100644 index 423f9f65a2f..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation.cdp +++ /dev/null @@ -1,233 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_02</location> - </externalReference> - </connection> - - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-example-with-federation.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_mcast.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_mcast.cdp deleted file mode 100644 index 4bfddce8258..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_mcast.cdp +++ /dev/null @@ -1,231 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_02</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-federation-mcast.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp.cdp deleted file mode 100644 index 7ee891285a8..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp.cdp +++ /dev/null @@ -1,246 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <!-- The Sender Component connects to "ES_01" --> - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <!-- The Receiver Component connects to "ES_02" --> - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_02</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Hello_Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Hello_Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Hello_Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-federation-udp.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_collocated.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_collocated.cdp deleted file mode 100644 index 0d254e2214e..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_collocated.cdp +++ /dev/null @@ -1,246 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <!-- The Sender Component connects to "ES_01" --> - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <!-- The Receiver Component connects to "ES_02" --> - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_02</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Hello_Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-federation-udp-collocated.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_two_hosts.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_two_hosts.cdp deleted file mode 100644 index d7a0c7fcf00..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_federation_udp_two_hosts.cdp +++ /dev/null @@ -1,246 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - <!-- The Sender Component connects to "ES_01" --> - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <!-- The Receiver Component connects to "ES_02" --> - <connection> - <name>hello_event_ec_consumer_connection</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_02</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-federation-udp-two-hosts.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_multiple_senders.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_multiple_senders.cdp deleted file mode 100644 index ff2ac89bf8f..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_multiple_senders.cdp +++ /dev/null @@ -1,395 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd-01"> - <name>Hello-Sender-idd-01</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender01.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Sender-idd-02"> - <name>Hello-Sender-idd-02</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender02.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message from Sender 02 passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>red</enum> - </value> - </value> - </configProperty> - </instance> - - - <instance id="Hello-Sender-idd-03"> - <name>Hello-Sender-idd-03</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender03.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message from Sender 03 passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>white</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd-01</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - -<!-- - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd-01</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> ---> - - <connection> - <name>hello_event_ec_publisher_connection_01</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd-01</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_publisher_connection_02</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd-02</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_publisher_connection_03</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd-03</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_consumer_connection_01</name> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Hello_Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Hello_Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Hello_Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-example.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/deploymentplan_with_filters.cdp b/CIAO/examples/Hello/descriptors_events/deploymentplan_with_filters.cdp deleted file mode 100644 index 7f776924945..00000000000 --- a/CIAO/examples/Hello/descriptors_events/deploymentplan_with_filters.cdp +++ /dev/null @@ -1,278 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - -<!-- - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> ---> - - <connection> - <name>hello_event_ec_publisher_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <connection> - <name>hello_event_ec_consumer_connection</name> - - <!-- The position of the below "deployRequirement" element matters --> - <deployRequirement> - <resourceType>EventFilter</resourceType> - <name>my_filter_01</name> - <property> - <name>EventFilter</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>my_filter_01</string> - </value> - </value> - </property> - </deployRequirement> - - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - <externalReference> - <location>ES_01</location> - </externalReference> - </connection> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Hello_Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <infoProperty> - <name>CIAOEvents</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>ciao-events-example-with-filters.ced</string> - </value> - </value> - </infoProperty> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/rtec.conf b/CIAO/examples/Hello/descriptors_events/rtec.conf deleted file mode 100644 index fbbadf78b0c..00000000000 --- a/CIAO/examples/Hello/descriptors_events/rtec.conf +++ /dev/null @@ -1 +0,0 @@ -static EC_Factory "-ECobserver basic" diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl deleted file mode 100755 index 8d76c400579..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons.pl +++ /dev/null @@ -1,40 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile1 = PerlACE::LocalFile ("NodeApp1.ior"); -$iorfile2 = PerlACE::LocalFile ("NodeApp2.ior"); - -#for ($iter = 0; $iter <= $#ARGV; $iter++) { -# if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { -# print "Run_Test Perl script for NodeApplicationTest \n\n"; -# print "run_test \n"; -# print "\n"; -# print "-h -- prints this information\n"; -# exit 0; -# } -#} - - -unlink $iorfile1; -unlink $iorfile2; - -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500"); - -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500"); - -$SV1->Spawn (); -$SV2->Spawn (); - -sleep (99999999999); diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl deleted file mode 100755 index 8cdc79b11bd..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl +++ /dev/null @@ -1,42 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -$ACE_ROOT=$ENV{'ACE_ROOT'}; - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile1 = PerlACE::LocalFile ("NodeApp1.ior"); -$iorfile2 = PerlACE::LocalFile ("NodeApp2.ior"); - -#for ($iter = 0; $iter <= $#ARGV; $iter++) { -# if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { -# print "Run_Test Perl script for NodeApplicationTest \n\n"; -# print "run_test \n"; -# print "\n"; -# print "-h -- prints this information\n"; -# exit 0; -# } -#} - - -unlink $iorfile1; -unlink $iorfile2; - -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -c rtec.conf"); - -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -c rtec.conf"); - -$SV1->Spawn (); -$SV2->Spawn (); - -sleep (99999999999); diff --git a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl b/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl deleted file mode 100644 index 24d630d66f6..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl +++ /dev/null @@ -1,40 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::Run_Test; - -$status = 0; -$iorfile1 = PerlACE::LocalFile ("NodeApp1.ior"); -$iorfile2 = PerlACE::LocalFile ("NodeApp2.ior"); - -#for ($iter = 0; $iter <= $#ARGV; $iter++) { -# if ($ARGV[$iter] eq "-h" || $ARGV[$iter] eq "-?") { -# print "Run_Test Perl script for NodeApplicationTest \n\n"; -# print "run_test \n"; -# print "\n"; -# print "-h -- prints this information\n"; -# exit 0; -# } -#} - - -unlink $iorfile1; -unlink $iorfile2; - -$CIAO_ROOT=$ENV{'CIAO_ROOT'}; - -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://129.59.129.181:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500"); - -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://129.59.129.181:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 500"); - -$SV1->Spawn (); -$SV2->Spawn (); - -sleep (99999999999); diff --git a/CIAO/examples/Hello/descriptors_events/run_test.pl b/CIAO/examples/Hello/descriptors_events/run_test.pl deleted file mode 100755 index f01bafa0505..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test.pl +++ /dev/null @@ -1,49 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -# run_test_simple -$result = RunEventTest::run_test ( - "deploymentplan_events.cdp", - "NodeManagerMap.dat"); - -# run_test_collocated -$result += RunEventTest::run_test ( - "deploymentplan_events_collocated.cdp", - "NodeManagerMap_collocated.dat"); - -# run_test_federated -$result += RunEventTest::run_test ( - "deploymentplan_federation.cdp", - "NodeManagerMap_collocated.dat"); - -# run_test_filtered -$result += RunEventTest::run_test ( - "deploymentplan_with_filters.cdp", - "NodeManagerMap_collocated.dat"); - -# run_test_multicast -# this test is not running successfully and is therefore skipped here -#$result += RunEventTest::run_test ( -# "deploymentplan_federation_mcast.cdp", -# "NodeManagerMap_collocated.dat"); - -# run_test_udp -$result += RunEventTest::run_test ( - "deploymentplan_federation_udp.cdp", - "NodeManagerMap.dat"); - -# run_test_udp_collocated -$result += RunEventTest::run_test ( - "deploymentplan_federation_udp_collocated.cdp", - "NodeManagerMap_collocated.dat"); - -# run_test_multiple_senders is not yet integrated - -exit $result - diff --git a/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl b/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl deleted file mode 100755 index c7d3e7c3dc4..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_collocated.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_events_collocated.cdp", - "NodeManagerMap_collocated.dat"); diff --git a/CIAO/examples/Hello/descriptors_events/run_test_federated.pl b/CIAO/examples/Hello/descriptors_events/run_test_federated.pl deleted file mode 100755 index 9d08455ce2e..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_federated.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_federation.cdp", - "NodeManagerMap_collocated.dat"); diff --git a/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl b/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl deleted file mode 100755 index d1371af7219..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_filtered.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_with_filters.cdp", - "NodeManagerMap_collocated.dat"); diff --git a/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl b/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl deleted file mode 100755 index 6d06589e3d2..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_multicast.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_federation_mcast.cdp", - "NodeManagerMap_collocated.dat"); diff --git a/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl b/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl deleted file mode 100755 index adac10d680c..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_multiple_senders.pl +++ /dev/null @@ -1,199 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::Run_Test; - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; -$daemons = 2; -@ports = ( 60001, 60002 ); -@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" ); -@senderiors = ( "Sender01.ior", "Sender02.ior", "Sender03.ior"); -$status = 0; -$dat_file = "NodeManagerMap.dat"; -$cdp_file = "deploymentplan_multiple_senders.cdp"; -$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; - -$nsior = PerlACE::LocalFile ("ns.ior"); - -unlink $nsior; - -$E = 0; -$EM = 0; - -# Delete if there are any .ior files. -sub delete_ior_files { - for ($i = 0; $i < $daemons; ++$i) { - unlink $iorfiles[$i]; - } - unlink PerlACE::LocalFile ("EM.ior"); - unlink PerlACE::LocalFile ("Receiver.ior"); - - for ($r = 0; $r < @senderiors; ++$r) { - unlink PerlACE::LocalFile ($senderiors[$r]); - } - - unlink PerlACE::LocalFile ("DAM.ior"); - unlink PerlACE::LocalFile ("ns.ior"); -} - -sub kill_node_daemons { - for ($i = 0; $i < $daemons; ++$i) { - $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); - } -} - -sub kill_open_processes { - if ($daemons_running == 1) { - kill_node_daemons (); - } - - if ($em_running == 1) { - $EM->Kill (); - $EM->TimedWait (1); - } - - if ($ns_running == 1) { - $NS->Kill (); - $NS->TimedWait (1); - } -} - -sub run_node_daemons { - for ($i = 0; $i < $daemons; ++$i) - { - $iorfile = $iorfiles[$i]; - $port = $ports[$i]; - - $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/NodeApplication"; - - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; - $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30"; - - $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); - $result = $Daemons[$i]->Spawn (); - push(@processes, $Daemons[$i]); - - if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR - "ERROR: The ior file of node daemon $i could not be found\n"; - for (; $i >= 0; --$i) { - $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); - } - return -1; - } - } - return 0; -} - -delete_ior_files (); - -# Invoke naming service - -$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior"); - -$NS->Spawn (); - -print STDERR "Starting Naming Service\n"; - -if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1) -{ - print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); - exit 1; -} - -$ns_running = 1; - -# Set up NamingService environment -$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; - -# Invoke node daemons. -print "Invoking node daemons\n"; -$status = run_node_daemons (); - -if ($status != 0) { - print STDERR "ERROR: Unable to execute the node daemons\n"; - kill_open_processes (); - exit 1; -} - -$daemons_running = 1; - -# Invoke execution manager. -print "Invoking execution manager\n"; -$EM = new PerlACE::Process ("$CIAO_ROOT/bin/Execution_Manager", - "-o EM.ior -i $dat_file"); -$EM->Spawn (); - -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 (); - exit 1; -} - -$em_running = 1; - -# Invoke executor - start the application -. -print "Invoking executor - start the application -\n"; -$E = - new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", - "-p $cdp_file -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 (); - exit 1; -} - -for ($si = 0; $si < @senderiors; ++$si) { - if (PerlACE::waitforfile_timed ($senderiors[$si], - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: The file " . $senderiors[$si] . " could not be found\n"; - kill_open_processes (); - exit 1; - } -} - -for ($si = 0; $si < @senderiors; ++$si) { - print "Invoking the controller for sender $si\n"; - $controller = new PerlACE::Process ("$controller_exec", "-k file://" . $senderiors[$si]); - $result = $controller->SpawnWaitKill (3000); - - if ($result != 0) { - print STDERR "ERROR: The controller returned $result\n"; - $status = 1; - } -} - -# Invoke executor - stop the application -. -print "Invoking executor - stop the application -\n"; -$E = - new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", - "-k file://EM.ior -i file://DAM.ior"); -$E->SpawnWaitKill (3000); - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/examples/Hello/descriptors_events/run_test_simple.pl b/CIAO/examples/Hello/descriptors_events/run_test_simple.pl deleted file mode 100755 index c678aa29545..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_simple.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_events.cdp", - "NodeManagerMap.dat"); diff --git a/CIAO/examples/Hello/descriptors_events/run_test_udp.pl b/CIAO/examples/Hello/descriptors_events/run_test_udp.pl deleted file mode 100755 index c84f30dcd30..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_udp.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_federation_udp.cdp", - "NodeManagerMap.dat"); diff --git a/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl b/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl deleted file mode 100755 index d45d68c238e..00000000000 --- a/CIAO/examples/Hello/descriptors_events/run_test_udp_collocated.pl +++ /dev/null @@ -1,12 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use RunEventTest; - -exit RunEventTest::run_test ( - "deploymentplan_federation_udp_collocated.cdp", - "NodeManagerMap_collocated.dat"); diff --git a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp b/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp deleted file mode 100644 index f2e55b93539..00000000000 --- a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp +++ /dev/null @@ -1,224 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0001</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd"> - <name>Hello-Sender-idd</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver.ior</string> - </value> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - -<!-- - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> ---> - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp b/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp deleted file mode 100644 index 912bab194c5..00000000000 --- a/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp +++ /dev/null @@ -1,229 +0,0 @@ -<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 Deployment.xsd"> - - <label>Hello-DeploymentPlan</label> - <UUID>Hello_Plan_UUID_0002</UUID> - <!-- Could be ZERO --> - <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> - <port> - <name>read_message</name> - <specificType>IDL:Hello/ReadMessage:1.0</specificType> - <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> - <provider>false</provider> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>true</exclusiveUser> - <optional>false</optional> - <kind>SimplexReceptacle</kind> - </port> - </realizes> - - <implementation id="Hello-Sender-mdd"> - <name>Hello-Sender-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Sender_exec</artifact> - <artifact>Hello-Sender_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <implementation id="Hello-Receiver-mdd"> - <name>Hello-Receiver-mdd</name> - <source><!-- @@ Don't know what goes here --></source> - <artifact>Hello-Receiver_exec</artifact> - <artifact>Hello-Receiver_svnt</artifact> - <!-- - <execParameter></execParameter> - <deployRequirement></deployRequirement> - --> - </implementation> - - <instance id="Hello-Sender-idd-new-component"> - <name>Hello-Sender-idd-new-component</name> - <node>SenderNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Sender-mdd</implementation> - - <!-- Add this property if you want to write component reference to IOR --> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender_new_component.ior</string> - </value> - </value> - </configProperty> - - <!-- Add this property if you want to initialize component attribute --> - <configProperty> - <name>local_message</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>This is a test message passed in through XML.</string> - </value> - </value> - </configProperty> - - <!-- This attribute initializes an enumerated value --> - <configProperty> - <name>color</name> - <value> - <type> - <kind>tk_enum</kind> - <enum> - <name>COLOR_SELECTION</name> - <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> - <member>empty</member> - <member>white</member> - <member>red</member> - <member>yellow</member> - </enum> - </type> - <value> - <enum>yellow</enum> - </value> - </value> - </configProperty> - </instance> - - <instance id="Hello-Receiver-idd"> - <name>Hello-Receiver-idd</name> - <node>ReceiverNode</node> - <source><!-- @@ What goes here --></source> - <implementation>Hello-Receiver-mdd</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <!-- **************************************** - 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> - </value> - </configProperty> - </instance> - - - <connection> - <name>hello_event_connection</name> - <internalEndpoint> - <portName>click_out</portName> - <kind>EventPublisher</kind> - <instance>Hello-Sender-idd-new-component</instance> - </internalEndpoint> - <internalEndpoint> - <portName>click_in</portName> - <kind>EventConsumer</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - - <connection> - <name>hello_facet_connection</name> - <internalEndpoint> - <portName>push_message</portName> - <kind>Facet</kind> - <instance>Hello-Sender-idd-new-component</instance> - </internalEndpoint> - <internalEndpoint> - <portName>read_message</portName> - <kind>SimplexReceptacle</kind> - <instance>Hello-Receiver-idd</instance> - </internalEndpoint> - </connection> - - - <!-- @@ Runtime library name must match exactly in "location" tag --> - <artifact id="Hello-Sender_exec"> - <name>Sender_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Sender_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Sender_svnt"> - <name>Sender_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Sender_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_SenderHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_exec"> - <name>Receiver_exec</name> - <source><!-- @@ Not sure about this--></source> - <node><!-- blank --></node> - <location>Hello_Receiver_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Impl</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Hello-Receiver_svnt"> - <name>Receiver_svnt</name> - <source><!-- @@ Not sure --></source> - <node><!-- blank --></node> - <location>Hello_Receiver_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Hello_ReceiverHome_Servant</string> - </value> - </value> - </execParameter> - </artifact> -</Deployment:deploymentPlan> |