Tue Jul 20 08:31:28 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp:
          Added union connectors to these deployment plans.

1 files changed, 128 insertions, 0 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
index c64aa5ef4f9..8f6fdf1d154 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
@@ -318,6 +318,58 @@
     </execParameter>
   </implementation>
 
+  <implementation xmi:id="VT_X_Union_ConnectorComponentImplementation">
+    <name>VT_X_Union_ConnectorComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="VT_Union_Connector_ExecArtifact" />
+    <artifact xmi:idref="VT_Union_Connector_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see 10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_VTopic_X_UnionConnector_DDS_Event_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_VTopic_X_UnionConnector_DDS_Event_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>VT_Union_Connector_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>VT_Union_Connector_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
   <implementation xmi:id="VT_Seq_ConnectorComponentImplementation">
     <name>VT_Seq_ConnectorComponentImplementation</name>
     <source/>
@@ -614,6 +666,43 @@
     </configProperty>
   </instance>
 
+  <instance xmi:id="VT_X_Union_ConnectorComponentInstance">
+    <name>VT_X_Union_ConnectorComponent</name>
+    <node>SenderNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
+    <configProperty>
+      <name>topic_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Test_X_Union</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="VT_X_Union_ConnectorComponentInstance2">
+    <name>VT_X_Union_ConnectorComponent2</name>
+    <node>ReceiverNode</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="VT_X_Union_ConnectorComponentImplementation" />
+    <configProperty>
+      <name>topic_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Test_X_Union</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
   <instance xmi:id="VT_Seq_ConnectorComponentInstance">
     <name>VT_Seq_ConnectorComponent</name>
     <node>SenderNode</node>
@@ -921,6 +1010,45 @@
     </internalEndpoint>
   </connection>
 
+  <connection>
+    <name>connector_status_receiver_x_union</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>connector_status</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>error_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>connector_status_sender_x_union</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>connector_status</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SenderComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>error_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="VT_X_Union_ConnectorComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
   <!--
       *****************************
       Sequence connector connections