Thu Dec 1 09:15:53 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>

        * connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp:
        * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:

        * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp:
        * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:
        Changes for using now sync port ami connector beside Sender-Receiver connection

5 files changed, 1571 insertions, 190 deletions

diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index 4f4b1ff2a2a..1962e2e0c95 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,12 @@
+Thu Dec  1 09:15:53 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp:
+        * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:
+
+        * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp:
+        * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:
+        Changes for using now sync port ami connector beside Sender-Receiver connection
+
 Wed Nov 30 16:11:09 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
         * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp:
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp
new file mode 100644
index 00000000000..b78ca7a9d03
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp
@@ -0,0 +1,736 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- $Id$ -->
+<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">
+
+  <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID>
+
+  <implementation xmi:id="InterMulti_ReceiverHomeImplementation">
+    <name>InterMulti_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="InterMulti_SenderHomeImplementation">
+    <name>InterMulti_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_Sender_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+<!-- conn one-->
+  <implementation xmi:id="InterMulti_AMIOneHomeImplementation">
+    <name>InterMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_AMIOne_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_AMIOne_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  <!-- conn two-->
+  <implementation xmi:id="InterMulti_AMITwoHomeImplementation">
+    <name>InterMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_AMITwo_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_AMITwo_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Two_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  <!-- conn one-->
+  <implementation xmi:id="InterMulti_AMIThreeHomeImplementation">
+    <name>InterMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_AMIThree_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_AMIThree_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Three_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_ReceiverHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_SenderHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_AMITwoHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_AMIThreeHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+
+
+  <connection>
+    <name>run_asynch_one_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_two_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_two</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_three_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_three</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>do_one_connection</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_two_connection</name>
+    <internalEndpoint>
+      <portName>do_my_two</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_three_connection</name>
+    <internalEndpoint>
+      <portName>do_my_three</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" />
+    </internalEndpoint>
+  </connection>
+
+  <!--connection>
+    <name>synch_one_connection</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+  <!--connection>
+    <name>synch_two_connection</name>
+    <internalEndpoint>
+      <portName>do_my_two</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_two</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+  <!--connection>
+    <name>synch_three_connection</name>
+    <internalEndpoint>
+      <portName>do_my_three</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_three</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+
+<connection>
+    <name>synch_one_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_two_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_two</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_three_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_three</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" />
+    </internalEndpoint>
+  </connection>
+   <artifact xmi:id="InterMulti_AMIOne_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMITwo_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMIThree_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_AMIOne_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMITwo_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_Two_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMIThree_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_Three_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Receiver_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Receiver_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Sender_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Sender_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
index 2a8c52c0780..9cddc90c16f 100755
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
@@ -135,106 +135,122 @@ sub run_node_daemons {
 
 create_targets ();
 init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
+if ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
 }
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
+else {
+    @files = @ARGV;
 }
 
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+foreach $file (@files) {
+    print "=============================\nStarting test for deployment $file\n================================\n";
+
+	# Invoke naming service
+	
+	$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+	
+	print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+	
+	$ns_status = $NS->Spawn ();
+	
+	if ($ns_status != 0) {
+	    print STDERR "ERROR: Unable to execute the naming service\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
+	
+	if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+	                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
+	    print STDERR "ERROR: cannot find naming service IOR file\n";
+	    $NS->Kill (); $NS->TimedWait (1);
+	    exit 1;
+	}
+	
+	$ns_running = 1;
+	# Set up NamingService environment
+	$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+	
+	# Invoke node daemon.
+	print "Invoking node daemon\n";
+	$status = run_node_daemons ();
+	
+	if ($status != 0) {
+	    print STDERR "ERROR: Unable to execute the node daemon\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
+	
+	$daemons_running = 1;
+	
+	# Invoke execution manager.
+	print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
+	$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+	                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
+	$em_status = $EM->Spawn ();
+	
+	if ($em_status != 0) {
+	    print STDERR "ERROR: dance_execution_manager returned $em_status";
+	    exit 1;
+	}
+	
+	if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+	                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
+	
+	print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
+	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+	                                  "-x $cdp_file -k file://$ior_emfile");
+	
+	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
+	
+	if ($pl_status != 0) {
+	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
+	
+	for ($i = 0; $i < $nr_daemon; ++$i) {
+	    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
+	                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
+	        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+	        kill_open_processes ();
+	        exit 1;
+	    }
+	}
+	
+	print "Sleeping 30 seconds to allow task to complete\n";
+	sleep (30);
+	
+	# Invoke executor - stop the application -.
+	print "Invoking executor - stop the application -\n";
+	print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
+	
+	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+	                                  "-k file://$ior_emfile -x $cdp_file -s");
+	$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
+	
+	if ($pl_status != 0) {
+	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
 
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
-}
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                  "-x $cdp_file -k file://$ior_emfile");
-
-$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                  "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    delete_ior_files ();
     kill_open_processes ();
-    exit 1;
+    # Sleep for a couple seconds to make sure everything has a chance to shut down.
+    sleep 5;
 }
-
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp
new file mode 100644
index 00000000000..768b56f9a81
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp
@@ -0,0 +1,606 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- $Id$ -->
+<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">
+
+  <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID>
+
+  <implementation xmi:id="UsesMulti_ReceiverHomeImplementation">
+    <name>UsesMulti_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="UsesMulti_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="UsesMulti_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="UsesMulti_SenderHomeImplementation">
+    <name>UsesMulti_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="UsesMulti_Sender_ExecArtifact"/>
+    <artifact xmi:idref="UsesMulti_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+<!-- conn one-->
+  <implementation xmi:id="UsesMulti_AMIOneHomeImplementation">
+    <name>UsesMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="UsesMulti_AMIOne_ExecArtifact"/>
+    <artifact xmi:idref="UsesMulti_AMIOne_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI4CCM_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+    <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_ReceiverHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_ReceiverHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_ReceiverHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_SenderHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+
+  <connection>
+    <name>run_asynch_one_connectionA</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_one_connectionB</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_one_connectionC</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" />
+    </internalEndpoint>
+  </connection>
+
+
+  <connection>
+    <name>do_one_connectionA</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_one_connectionB</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_one_connectionC</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" />
+    </internalEndpoint>
+  </connection>
+
+
+
+  <!connection>
+    <name>synch_one_connectionA</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+  <!--connection>
+    <name>synch_one_connectionB</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+  <!--connection>
+    <name>synch_one_connectionC</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+
+ <connection>
+    <name>synch_one_connectionA</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_one_connectionB</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_one_connectionC</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" />
+    </internalEndpoint>
+  </connection>
+
+
+  <artifact xmi:id="UsesMulti_AMIOne_SvntArtifact">
+    <name>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+
+
+  <artifact xmi:id="UsesMulti_AMIOne_ExecArtifact">
+    <name>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+
+  <artifact xmi:id="UsesMulti_Receiver_SvntArtifact">
+    <name>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="UsesMulti_Receiver_ExecArtifact">
+    <name>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="UsesMulti_Sender_SvntArtifact">
+    <name>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="UsesMulti_Sender_ExecArtifact">
+    <name>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
index 8510b5e19ae..cb676ab79a7 100755
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
@@ -135,107 +135,121 @@ sub run_node_daemons {
 
 create_targets ();
 init_ior_files ();
-
-# Invoke naming service
-
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-$ns_status = $NS->Spawn ();
-
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-if ($tg_naming->WaitForFileTimed ($ior_nsbase,
-                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-}
-
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$daemons_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
-$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-$em_status = $EM->Spawn ();
-
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 1;
+if ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
 }
-
-if ($tg_exe_man->WaitForFileTimed ($ior_embase,
-                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
-
-print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                  "-x $cdp_file -k file://$ior_emfile");
-
-$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
+else {
+    @files = @ARGV;
 }
+foreach $file (@files) {
+    print "=============================\nStarting test for deployment $file\n================================\n";
+
+	# Invoke naming service
+	
+	$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+	
+	print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+	
+	$ns_status = $NS->Spawn ();
+	
+	if ($ns_status != 0) {
+	    print STDERR "ERROR: Unable to execute the naming service\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
+	
+	if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+	                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
+	    print STDERR "ERROR: cannot find naming service IOR file\n";
+	    $NS->Kill (); $NS->TimedWait (1);
+	    exit 1;
+	}
+	
+	$ns_running = 1;
+	# Set up NamingService environment
+	$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+	
+	# Invoke node daemon.
+	print "Invoking node daemon\n";
+	$status = run_node_daemons ();
+	
+	if ($status != 0) {
+	    print STDERR "ERROR: Unable to execute the node daemon\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
+	
+	$daemons_running = 1;
+	
+	# Invoke execution manager.
+	print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
+	$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+	                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
+	$em_status = $EM->Spawn ();
+	
+	if ($em_status != 0) {
+	    print STDERR "ERROR: dance_execution_manager returned $em_status";
+	    exit 1;
+	}
+	
+	if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+	                                $tg_exe_man->ProcessStartWaitInterval ()) == -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 - launch the application -\n";
+	
+	print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
+	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+	                                  "-x $cdp_file -k file://$ior_emfile");
+	
+	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
+	
+	if ($pl_status != 0) {
+	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
+	
+	for ($i = 0; $i < $nr_daemon; ++$i) {
+	    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
+	                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
+	        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+	        kill_open_processes ();
+	        exit 1;
+	    }
+	}
+	
+	print "Sleeping 30 seconds to allow task to complete\n";
+	sleep (30);
+	
+	# Invoke executor - stop the application -.
+	print "Invoking executor - stop the application -\n";
+	print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
+	
+	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+	                                  "-k file://$ior_emfile -x $cdp_file -s");
+	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
+	
+	if ($pl_status != 0) {
+	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
 
-for ($i = 0; $i < $nr_daemon; ++$i) {
-    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
-                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
-        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
-        kill_open_processes ();
-        exit 1;
-    }
-}
-
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                  "-k file://$ior_emfile -x $cdp_file -s");
-$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    delete_ior_files ();
     kill_open_processes ();
-    exit 1;
+    # Sleep for a couple seconds to make sure everything has a chance to shut down.
+    sleep 5;
 }
-
-print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
 
 delete_ior_files ();