Tue Apr 6 18:51:42 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp:
          Prevented memory leak by using xxx_var variables and
          then test whether they're nil.

        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl:
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp:
          Added Connector declaration to the ListenManyByMany module.
          Also resolved test errors.

        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl:
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp:
          Added Connector declaration to the ListenOneByOne module.
          Also resolved test errors.

18 files changed, 108 insertions, 82 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9ab659cd8c1..42cc26b92c7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,31 @@
+Tue Apr  6 18:51:42 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp:
+        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp:
+          Prevented memory leak by using xxx_var variables and
+          then test whether they're nil.
+
+        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp:
+          Added Connector declaration to the ListenManyByMany module.
+          Also resolved test errors.
+
+        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp:
+          Added Connector declaration to the ListenOneByOne module.
+          Also resolved test errors.
+
 Tue Apr  6 13:53:12 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Containers/Container_Base.h:
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp
index d2421e0ac49..3c37ed761bb 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp
@@ -117,37 +117,69 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (void)
 
   this->push_consumer_obtained_ |=
     ! ::CORBA::is_nil (this->context_->get_connection_push_consumer_data_listener ());
-  this->push_consumer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_push_consumer_status ());
+
+  ::CCM_DDS::PortStatusListener_var push_consumer_psl =
+    this->context_->get_connection_push_consumer_status ();
+  this->push_consumer_obtained_ |= ! ::CORBA::is_nil (push_consumer_psl.in ());
+
+  ::CCM_DDS::PortStatusListener_var pull_consumer_psl =
+    this->context_->get_connection_pull_consumer_status ();
   this->pull_consumer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_pull_consumer_status ());
+    ! ::CORBA::is_nil (pull_consumer_psl.in ());
 
   if (this->push_consumer_obtained_)
     {
+      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
+                    "DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete - "
+                    "Creating push consumer port.\n"));
       this->push_consumer_.configuration_complete (
         this->topic_.in (),
         this->subscriber_.in (),
         this->library_name_,
         this->profile_name_);
     }
+  else
+    {
+      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
+                    "DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete - "
+                    "No need to create push consumer port.\n"));
+    }
 
   if (this->supplier_obtained_)
     {
+      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
+                    "DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete - "
+                    "Creating supplier port.\n"));
       this->supplier_.configuration_complete(
         this->topic_.in (),
         this->publisher_.in (),
         this->library_name_,
         this->profile_name_);
     }
+  else
+    {
+      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
+                    "DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete - "
+                    "No need to create supplier port.\n"));
+    }
 
   if (this->pull_consumer_obtained_)
     {
+      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
+                    "DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete - "
+                    "Creating pull consumer port.\n"));
       this->pull_consumer_.configuration_complete (
         this->topic_.in (),
         this->subscriber_.in (),
         this->library_name_,
         this->profile_name_);
     }
+  else
+    {
+      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
+                    "DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete - "
+                    "No need to create pull consumer port.\n"));
+    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp
index 5f7aa834d64..6684ceffa78 100644
--- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp
@@ -168,20 +168,29 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (void)
 
   TopicBaseConnector::configuration_complete ();
 
-  this->push_observer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_push_observer_data_listener ());
-  this->push_observer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_push_observer_status ());
-
-  this->push_state_observer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_push_state_observer_data_listener ());
-    ! ::CORBA::is_nil (this->context_->get_connection_push_state_observer_status ());
-
-  this->pull_observer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_pull_observer_status ());
-
-  this->passive_observer_obtained_ |=
-    ! ::CORBA::is_nil (this->context_->get_connection_passive_observer_status ());
+  ::CCM_DDS::PortStatusListener_var push_observer_psl =
+    this->context_->get_connection_push_observer_status ();
+  typename CCM_TYPE::listener_type::_var_type push_observer_dl =
+    typename CCM_TYPE::listener_type::_ptr_type
+      this->context_->get_connection_push_observer_data_listener ();
+  this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_psl.in ());
+  this->push_observer_obtained_ |= ! ::CORBA::is_nil (push_observer_dl.in ());
+
+  ::CCM_DDS::PortStatusListener_var push_state_observer_psl =
+    this->context_->get_connection_push_state_observer_status ();
+  typename CCM_TYPE::listener_type::_var_type push_state_observer_dl =
+    typename CCM_TYPE::listener_type::_ptr_type
+      this->context_->get_connection_push_state_observer_data_listener ();
+  this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_psl.in ());
+  this->push_state_observer_obtained_ |= ! ::CORBA::is_nil (push_state_observer_dl.in ());
+
+  ::CCM_DDS::PortStatusListener_var pull_observer_psl =
+    this->context_->get_connection_pull_observer_status ();
+  this->pull_observer_obtained_ |= ! ::CORBA::is_nil (pull_observer_psl.in ());
+
+  ::CCM_DDS::PortStatusListener_var passive_observer_psl =
+    this->context_->get_connection_passive_observer_status ();
+  this->passive_observer_obtained_ |= ! ::CORBA::is_nil (passive_observer_psl.in ());
 
   if (this->observable_obtained_)
     {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
index 382440babad..e92d52e46c0 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl
@@ -14,14 +14,12 @@
 
 #pragma ciao lem "Connector/LMBM_Test_ConnectorE.idl"
 
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::ListenManyByManyTest, ::ListenManyByManyTestSeq> ListenManyByManyTest;
-};
-
 module LMBM_Test
 {
-  connector LMBM_Test_Connector : ::CCM_DDS::ListenManyByManyTest::DDS_Event
+  module ::CCM_DDS::Typed
+    < ::ListenManyByManyTest, ::ListenManyByManyTestSeq>
+    ListenManyByManyTestConn;
+  connector LMBM_Test_Connector : ListenManyByManyTestConn::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
index 1361b12bcb0..71f1f8ed89d 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
@@ -14,7 +14,7 @@ module LMBM_Test
 {
   component Receiver
   {
-    port CCM_DDS::ListenManyByManyTest::DDS_Listen info_listen;
+    port ListenManyByManyTestConn::DDS_Listen info_listen;
 
     attribute unsigned short keys;
     attribute unsigned short iterations;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index f1cc126d602..5c87ba07158 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -93,7 +93,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
     dlc->mode (::CCM_DDS::MANY_BY_MANY);
   }
 
-  ::CCM_DDS::ListenManyByManyTest::CCM_Listener_ptr
+  ::LMBM_Test::ListenManyByManyTestConn::CCM_Listener_ptr
   Receiver_exec_i::get_info_listen_data_listener (void)
   {
     return new ListenManyByManyTest_Listener_exec_i (
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
index 62bf7fe54b5..07b9175734a 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
@@ -25,7 +25,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   // ListenManyByManyTest_Listener_exec_i
   //============================================================
   class RECEIVER_EXEC_Export ListenManyByManyTest_Listener_exec_i
-    : public virtual ::CCM_DDS::ListenManyByManyTest::CCM_Listener,
+    : public virtual ::LMBM_Test::ListenManyByManyTestConn::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -68,7 +68,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
 
     virtual void keys (::CORBA::UShort keys);
 
-    virtual ::CCM_DDS::ListenManyByManyTest::CCM_Listener_ptr
+    virtual ::LMBM_Test::ListenManyByManyTestConn::CCM_Listener_ptr
     get_info_listen_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
index 8d63e3f04e8..38fc751dc0b 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl
@@ -16,7 +16,7 @@ module LMBM_Test
 {
   component Sender
   {
-    port CCM_DDS::ListenManyByManyTest::DDS_Write info_write;
+    port ListenManyByManyTestConn::DDS_Write info_write;
 
     attribute unsigned short keys;
     attribute unsigned short iterations;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
index 7f082427a10..4e712e29294 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp
@@ -64,7 +64,8 @@ namespace CIAO_LMBM_Test_Sender_Impl
         try
           {
             ++this->last_key_->second->iteration;
-            this->writer_->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
+            this->writer_->write_one (this->last_key_->second,
+                                      ::DDS::HANDLE_NIL);
             ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
                           this->last_key_->first.c_str (),
                           this->last_key_->second->iteration));
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
index 849b46310a8..82b86350114 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h
@@ -76,7 +76,7 @@ namespace CIAO_LMBM_Test_Sender_Impl
 
   private:
     ::LMBM_Test::CCM_Sender_Context_var context_;
-    CCM_DDS::ListenManyByManyTest::Writer_var writer_;
+    ::LMBM_Test::ListenManyByManyTestConn::Writer_var writer_;
 
     WriteTicker *ticker_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
index ab28d77b8e2..b8323b7fe93 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/Plan.cdp
@@ -278,26 +278,6 @@
   </instance>
 
   <connection>
-    <name>info_listen_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_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="LMBM_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
     <name>info_listen_data</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
index 17cf88650cf..e9d5300262c 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl
@@ -14,14 +14,12 @@
 
 #pragma ciao lem "Connector/LOBO_Test_ConnectorE.idl"
 
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::ListenOneByOneTest, ::ListenOneByOneTestSeq> ListenOneByOneTest;
-};
-
 module LOBO_Test
 {
-  connector LOBO_Test_Connector : ::CCM_DDS::ListenOneByOneTest::DDS_Event
+  module ::CCM_DDS::Typed
+    < ::ListenOneByOneTest, ::ListenOneByOneTestSeq>
+    ListenOneByOneTestConn;
+  connector LOBO_Test_Connector : ListenOneByOneTestConn::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
index a959a830358..d5b736d443f 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
@@ -14,7 +14,7 @@ module LOBO_Test
 {
   component Receiver
   {
-    port CCM_DDS::ListenOneByOneTest::DDS_Listen info_listen;
+    port ListenOneByOneTestConn::DDS_Listen info_listen;
 
     attribute unsigned short keys;
     attribute unsigned short iterations;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index 1a309fb33ff..cbbf0cf4a5a 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -89,7 +89,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
     dlc->mode (::CCM_DDS::ONE_BY_ONE);
   }
 
-  ::CCM_DDS::ListenOneByOneTest::CCM_Listener_ptr
+  ::LOBO_Test::ListenOneByOneTestConn::CCM_Listener_ptr
   Receiver_exec_i::get_info_listen_data_listener (void)
   {
     return new ListenOneByOneTest_Listener_exec_i (
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
index 81439447579..c14608c024a 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
@@ -31,7 +31,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   // ListenOneByOneTest_Listener_exec_i
   //============================================================
   class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i
-    : public virtual ::CCM_DDS::ListenOneByOneTest::CCM_Listener,
+    : public virtual ::LOBO_Test::ListenOneByOneTestConn::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -76,7 +76,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
 
     virtual void keys (::CORBA::UShort keys);
 
-    virtual ::CCM_DDS::ListenOneByOneTest::CCM_Listener_ptr
+    virtual ::LOBO_Test::ListenOneByOneTestConn::CCM_Listener_ptr
     get_info_listen_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
index 3a48c20035d..1dc822487ec 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl
@@ -16,7 +16,7 @@ module LOBO_Test
 {
   component Sender
   {
-    port CCM_DDS::ListenOneByOneTest::DDS_Write info_write;
+    port ListenOneByOneTestConn::DDS_Write info_write;
 
     attribute unsigned short keys;
     attribute unsigned short iterations;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
index 3245a58ca6f..fc2593a5bda 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
@@ -78,7 +78,7 @@ namespace CIAO_LOBO_Test_Sender_Impl
 
   private:
     ::LOBO_Test::CCM_Sender_Context_var context_;
-    CCM_DDS::ListenOneByOneTest::Writer_var writer_;
+    ::LOBO_Test::ListenOneByOneTestConn::Writer_var writer_;
 
     WriteTicker *ticker_;
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
index f552f012852..be97bb9b3e5 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp
@@ -256,26 +256,6 @@
   </instance>
 
   <connection>
-    <name>info_listen_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_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="LOBO_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
     <name>info_listen_data</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>