Tue Jan 24 19:14:53 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/CCM_DataReader.h:
        * connectors/dds4ccm/impl/CCM_DataWriter.h:
        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
          Make it possible to also use _get_component on the dds_entity ports

        * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp:
        * connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp:
        * connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp:
          Test _get_component on the dds_entity ports

10 files changed, 345 insertions, 18 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e1d651cff7a..bfac1954cdc 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Tue Jan 24 19:14:53 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/CCM_DataReader.h:
+        * connectors/dds4ccm/impl/CCM_DataWriter.h:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+          Make it possible to also use _get_component on the dds_entity ports
+
+        * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp:
+        * connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp:
+        * connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp:
+          Test _get_component on the dds_entity ports
+
 Tue Jan 24 18:31:45 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_3769_Regression/Foo.idl:
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h
index 41b5fa0b6ed..6e156d65a45 100644
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h
@@ -12,13 +12,15 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 #include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
+#include "dds4ccm/impl/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
     class DDS4CCM_DDS_IMPL_Export CCM_DataReader
-      : public ::DDS::CCM_DataReader
+      : public virtual ::DDS::CCM_DataReader,
+        public virtual LocalObject
     {
     public:
       /// Constructor
diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h
index 91e719f2681..2475fe328db 100644
--- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h
@@ -12,13 +12,15 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 #include "dds4ccm/impl/dds4ccm_dds_impl_export.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
+#include "dds4ccm/impl/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
     class DDS4CCM_DDS_IMPL_Export CCM_DataWriter
-      : public ::DDS::CCM_DataWriter
+      : public virtual ::DDS::CCM_DataWriter,
+        public virtual LocalObject
     {
     public:
       /// Constructor
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
index 3d95f4f60bc..a453cfc0693 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
@@ -24,6 +24,7 @@ DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::s
     ::CORBA::Object_ptr component)
 {
   this->dds_read_->_set_component (component);
+  this->ccm_data_reader_->_set_component (component);
 }
 
 template <typename CCM_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
index 3277146a1bd..6cae9cfe58f 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
@@ -24,6 +24,7 @@ void
 DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (::CORBA::Object_ptr component)
 {
   this->dds_update_->_set_component (component);
+  this->ccm_data_writer_->_set_component (component);
 }
 
 template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
index c892fffe610..cc56127e41b 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
@@ -22,6 +22,7 @@ DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::set_component (
   ::CORBA::Object_ptr component)
 {
   this->dds_write_->_set_component (component);
+  this->ccm_data_writer_->_set_component (component);
 }
 
 template <typename CCM_TYPE, typename TYPED_WRITER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE>
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
index b0a97b8dbdc..e249aca91c7 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp
@@ -72,7 +72,6 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
   {
   }
 
-
   void
   Component_exec_i::test_writer ()
   {
@@ -96,7 +95,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ")
                                       ACE_TEXT ("Writer on DDS_Write port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -118,6 +117,48 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
                               ACE_TEXT ("Unknown exception caught while testing ")
                               ACE_TEXT ("writer_data\n")));
       }
+
+    try
+      {
+        ::DDS::DataWriter_var writer_dds_entity =
+          this->context_->get_connection_info_write_dds_entity ();
+        if (! ::CORBA::is_nil (writer_dds_entity.in ()))
+          {
+            CORBA::Object_var cmp = writer_dds_entity->_get_component ();
+            ::GCETestConnector::CCM_DDS_Event_var conn =
+              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
+            if (::CORBA::is_nil (conn.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
+                                      ACE_TEXT ("Unable to get component interface of ")
+                                      ACE_TEXT ("writer_dds_entity\n")));
+              }
+            else
+              {
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_writer - ")
+                                      ACE_TEXT ("dds_entity on DDS_Write port returned a ")
+                                      ACE_TEXT ("reference on _get_component.\n")));
+              }
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - "
+                                  ACE_TEXT ("writer_dds_entity is NIL.\n"))));
+          }
+      }
+    catch (const ::CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: ");
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
+                              ACE_TEXT ("CORBA exception caught while testing ")
+                              ACE_TEXT ("write_dds_entity\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ")
+                              ACE_TEXT ("Unknown exception caught while testing ")
+                              ACE_TEXT ("writer_data\n")));
+      }
   }
 
   void
@@ -143,7 +184,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
                                       ACE_TEXT ("Reader on DDS_Get port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -186,7 +227,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
                                       ACE_TEXT ("Getter on DDS_Get port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -208,6 +249,49 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
                               ACE_TEXT ("Unknown exception caught while testing ")
                               ACE_TEXT ("getter_fresh_data\n")));
       }
+
+    //Getter on DDS_Get
+    try
+      {
+        ::DDS::DataReader_var getter_dds_entity =
+          this->context_->get_connection_info_get_dds_entity ();
+        if (! ::CORBA::is_nil (getter_dds_entity.in ()))
+          {
+            CORBA::Object_var cmp = getter_dds_entity->_get_component ();
+            ::GCETestConnector::CCM_DDS_Event_var conn =
+              ::GCETestConnector::CCM_DDS_Event::_narrow (cmp.in ());
+            if (::CORBA::is_nil (conn.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                                      ACE_TEXT ("Unable to get component interface of ")
+                                      ACE_TEXT ("getter_dds_entity\n")));
+              }
+            else
+              {
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
+                                      ACE_TEXT ("dds_entity on DDS_Get port returned a ")
+                                      ACE_TEXT ("reference on _get_component.\n")));
+              }
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                                  ACE_TEXT ("getter_dds_entity is NIL.\n")));
+          }
+      }
+    catch (const ::CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                              ACE_TEXT ("CORBA exception caught while testing ")
+                              ACE_TEXT ("get_dds_entity\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                              ACE_TEXT ("Unknown exception caught while testing ")
+                              ACE_TEXT ("get_dds_entity\n")));
+      }
   }
 
   void
@@ -233,7 +317,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
                                       ACE_TEXT ("Reader on DDS_Listen port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -275,7 +359,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
                                       ACE_TEXT ("DataControl on DDS_Listen port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -311,7 +395,6 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl
         this->test_getter ();
         this->test_listener ();
       }
-
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
index 76d454a1c77..fbdd58aedfb 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/Plan.cdp
@@ -207,6 +207,25 @@
       <instance xmi:idref="GCE_Test_ConnectorInstance1" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>write_dds_entity</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_write_dds_entity</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ComponentInstance1" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>supplier_dds_entity</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="GCE_Test_ConnectorInstance1" />
+    </internalEndpoint>
+  </connection>
 
   <!-- RECEIVER COMPONENT CONNECTIONS -->
   <!--   DDS_Get port -->
@@ -230,6 +249,25 @@
     </internalEndpoint>
   </connection>
   <connection>
+    <name>get_dds_entity_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_get_dds_entity</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ComponentInstance2" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>pull_consumer_dds_entity</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="GCE_Test_ConnectorInstance2" />
+    </internalEndpoint>
+  </connection>
+  <connection>
     <name>get_fresh_data_port</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
index f3bf7ed40ef..68c8d83bb72 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp
@@ -107,7 +107,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ")
                                       ACE_TEXT ("Writer on DDS_Update port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -119,7 +119,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
     catch (const ::CORBA::Exception& ex)
       {
         ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: ");
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
                               ACE_TEXT ("CORBA exception caught while testing ")
                               ACE_TEXT ("updater_data\n")));
       }
@@ -129,6 +129,48 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
                               ACE_TEXT ("Unknown exception caught while testing ")
                               ACE_TEXT ("updater_data\n")));
       }
+
+    try
+      {
+        ::DDS::DataWriter_var updater_dds_entity =
+          this->context_->get_connection_info_update_dds_entity ();
+        if (! ::CORBA::is_nil (updater_dds_entity.in ()))
+          {
+            CORBA::Object_var cmp = updater_dds_entity->_get_component ();
+            ::GCSTestConnector::CCM_DDS_State_var conn =
+              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
+            if (::CORBA::is_nil (conn.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
+                                      ACE_TEXT ("Unable to get component interface of ")
+                                      ACE_TEXT ("updater_dds_entity\n")));
+              }
+            else
+              {
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_updater - ")
+                                      ACE_TEXT ("dds entity on DDS_Update port returned a ")
+                                      ACE_TEXT ("reference on _get_component.\n")));
+              }
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - "
+                                  ACE_TEXT ("updater_dds_entity is NIL.\n"))));
+          }
+      }
+    catch (const ::CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: ");
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
+                              ACE_TEXT ("CORBA exception caught while testing ")
+                              ACE_TEXT ("update_dds_entity\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_updater - ")
+                              ACE_TEXT ("Unknown exception caught while testing ")
+                              ACE_TEXT ("update_dds_entity\n")));
+      }
   }
 
   void
@@ -154,7 +196,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ")
                                       ACE_TEXT ("Reader on DDS_Read port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -176,6 +218,48 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
                               ACE_TEXT ("Unknown exception caught while testing ")
                               ACE_TEXT ("data_reader\n")));
       }
+
+    try
+      {
+        ::DDS::DataReader_var datareader =
+          this->context_->get_connection_info_read_dds_entity ();
+        if (! ::CORBA::is_nil (datareader.in ()))
+          {
+            CORBA::Object_var cmp = datareader->_get_component ();
+            ::GCSTestConnector::CCM_DDS_State_var conn =
+              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
+            if (::CORBA::is_nil (conn.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
+                                      ACE_TEXT ("Unable to get component interface of ")
+                                      ACE_TEXT ("dds_entity\n")));
+              }
+            else
+              {
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_reader - ")
+                                      ACE_TEXT ("DDS Entity on DDS_Read port returned a ")
+                                      ACE_TEXT ("reference on _get_component.\n")));
+              }
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - "
+                                  ACE_TEXT ("data entity is NIL.\n"))));
+          }
+      }
+    catch (const ::CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: ");
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
+                              ACE_TEXT ("CORBA exception caught while testing ")
+                              ACE_TEXT ("read_dds_entity\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ")
+                              ACE_TEXT ("Unknown exception caught while testing ")
+                              ACE_TEXT ("read_dds_entity\n")));
+      }
   }
 
   void
@@ -201,7 +285,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
                                       ACE_TEXT ("Reader on DDS_Get port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -224,6 +308,48 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
                               ACE_TEXT ("getter_data\n")));
       }
 
+    try
+      {
+        ::DDS::DataReader_var getter_dds_entity =
+          this->context_->get_connection_info_get_dds_entity ();
+        if (! ::CORBA::is_nil (getter_dds_entity.in ()))
+          {
+            CORBA::Object_var cmp = getter_dds_entity->_get_component ();
+            ::GCSTestConnector::CCM_DDS_State_var conn =
+              ::GCSTestConnector::CCM_DDS_State::_narrow (cmp.in ());
+            if (::CORBA::is_nil (conn.in ()))
+              {
+                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                                      ACE_TEXT ("Unable to get component interface of ")
+                                      ACE_TEXT ("getter_dds_entity\n")));
+              }
+            else
+              {
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
+                                      ACE_TEXT ("dds_entity on DDS_Get port returned a ")
+                                      ACE_TEXT ("reference on _get_component.\n")));
+              }
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                                  ACE_TEXT ("getter_dds_entity is NIL.\n")));
+          }
+      }
+    catch (const ::CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: ");
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                              ACE_TEXT ("CORBA exception caught while testing ")
+                              ACE_TEXT ("get_dds_entity\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ")
+                              ACE_TEXT ("Unknown exception caught while testing ")
+                              ACE_TEXT ("get_dds_entity\n")));
+      }
+
     //Getter on DDS_Get
     try
       {
@@ -244,7 +370,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_getter - ")
                                       ACE_TEXT ("Getter on DDS_Get port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -291,7 +417,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
                                       ACE_TEXT ("Reader on DDS_Listen port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -333,7 +459,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_listener - ")
                                       ACE_TEXT ("DataControl on DDS_Listen port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -380,7 +506,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ")
                                       ACE_TEXT ("Reader on DDS_StateListen port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -422,7 +548,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
               {
                 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Component_exec_i::test_statelistener - ")
                                       ACE_TEXT ("DataControl on DDS_StateListen port returned a ")
-                                      ACE_TEXT ("pointer on _get_component.\n")));
+                                      ACE_TEXT ("reference on _get_component.\n")));
               }
           }
         else
@@ -486,3 +612,4 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl
   }
 }
 
+
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
index d55078bf9e7..e3844ccbf66 100644
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/Plan.cdp
@@ -207,6 +207,25 @@
       <instance xmi:idref="GCS_Test_ConnectorInstance1" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>update_dds_entity</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_update_dds_entity</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ComponentInstance1" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>observable_dds_entity</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="GCS_Test_ConnectorInstance1" />
+    </internalEndpoint>
+  </connection>
 
   <!-- RECEIVER COMPONENT CONNECTIONS -->
   <!--   DDS_Get port -->
@@ -248,6 +267,25 @@
       <instance xmi:idref="GCS_Test_ConnectorInstance2" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>get_dds_entity_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_get_dds_entity</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ComponentInstance2" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>pull_observer_dds_entity</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
+    </internalEndpoint>
+  </connection>
 
   <!--   DDS_Read port -->
   <connection>
@@ -269,6 +307,25 @@
       <instance xmi:idref="GCS_Test_ConnectorInstance2" />
     </internalEndpoint>
   </connection>
+  <connection>
+    <name>read_dds_entity_port</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_read_dds_entity</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="ComponentInstance2" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>passive_observer_dds_entity</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="GCS_Test_ConnectorInstance2" />
+    </internalEndpoint>
+  </connection>
 
   <!--   DDS_Listen port -->
   <connection>