Wed Nov 18 15:27:24 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl:
        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp:
          Extended test with ConnectorStatusListener.

5 files changed, 47 insertions, 99 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 8ad92b99dea..314f94d318b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 18 15:27:24 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl:
+        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp:
+          Extended test with ConnectorStatusListener.
+
 Wed Nov 18 14:50:19 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp:
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl
index 00d144e6881..6f8c3008052 100644
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver.idl
@@ -18,6 +18,7 @@ module Get_Connection_Test
     port CCM_DDS::Get_ConnectionTest::DDS_Listen  info_listen;
     port CCM_DDS::Get_ConnectionTest::DDS_Get     info_get;
     //port CCM_DDS::Get_ConnectionTest::DDS_StateListen
+    provides CCM_DDS::ConnectorStatusListener status_listener;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
index cc329702a75..e9afd6a724b 100644
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
@@ -9,62 +9,7 @@
 namespace CIAO_Get_Connection_Test_Receiver_Impl
 {
   //============================================================
-  // Facet Executor Implementation Class: Get_ConnectionTest_Listener_exec_i
-  //============================================================
-
-  Get_ConnectionTest_Listener_exec_i::Get_ConnectionTest_Listener_exec_i ()
-  {
-  }
-
-  Get_ConnectionTest_Listener_exec_i::~Get_ConnectionTest_Listener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::Get_ConnectionTest_Listener
-  void
-  Get_ConnectionTest_Listener_exec_i::on_many_data (
-    const Get_ConnectionTest_Seq & ,
-    const ::CCM_DDS::ReadInfoSeq & )
-  {
-  }
-
-  void
-  Get_ConnectionTest_Listener_exec_i::on_one_data (
-    const Get_ConnectionTest &  ,
-    const ::CCM_DDS::ReadInfo & )
-  {
-  }
-
-  //============================================================
-  // Facet Executor Implementation Class: PortStatusListener_exec_i
-  //============================================================
-
-  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
-  {
-  }
-
-  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::PortStatusListener
-
-  void
-  PortStatusListener_exec_i::on_requested_deadline_missed (
-    ::DDS::DataReader_ptr ,
-    const ::DDS::RequestedDeadlineMissedStatus & )
-  {
-  }
-
-  void
-  PortStatusListener_exec_i::on_sample_lost (
-    ::DDS::DataReader_ptr ,
-    const ::DDS::SampleLostStatus & )
-  {
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_iGet_ConnectionTest_Listener_exec_i ();
+  // Component Executor Implementation Class: Receiver_exec_i
   //============================================================
 
   Receiver_exec_i::Receiver_exec_i (void)
@@ -74,7 +19,8 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
       data_listener_control_ok_ (false),
       raw_listener_created_ (false),
       listen_port_status_created_ (false),
-      get_port_status_created_ (false)
+      get_port_status_created_ (false),
+      get_status_listener_created_ (false)
   {
   }
 
@@ -88,7 +34,7 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
   {
     CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new Get_ConnectionTest RAW listener\n")));
     this->raw_listener_created_ = true;
-    return new Get_ConnectionTest_Listener_exec_i ();
+    return 0;
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -96,16 +42,23 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
   {
     CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener for DDS_Listen\n")));
     this->listen_port_status_created_ = true;
-    return new PortStatusListener_exec_i ();
+    return 0;
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_get_status (void)
   {
-    CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener for DDS_Get\n")));
     this->get_port_status_created_ = true;
-    return new PortStatusListener_exec_i ();
+    return 0;
   }
+  
+  CCM_DDS::CCM_ConnectorStatusListener_ptr
+  Receiver_exec_i::get_status_listener(void)
+  {
+    this->get_status_listener_created_ = true;
+    return 0;
+  }
+
 
   // Operations from Components::SessionComponent.
   void
@@ -191,6 +144,10 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
       }
+    if (!this->get_status_listener_created_)
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : ConnectorStatusListener not created\n")));
+      }
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h
index 4e36374c4e0..706e6c887b3 100644
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.h
@@ -18,44 +18,6 @@
 
 namespace CIAO_Get_Connection_Test_Receiver_Impl
 {
-  class RECEIVER_EXEC_Export Get_ConnectionTest_Listener_exec_i
-    : public virtual ::CCM_DDS::Get_ConnectionTest::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Get_ConnectionTest_Listener_exec_i ();
-    virtual ~Get_ConnectionTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const Get_ConnectionTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const Get_ConnectionTest_Seq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-  };
-
-  class RECEIVER_EXEC_Export PortStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_PortStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    PortStatusListener_exec_i (void);
-    virtual ~PortStatusListener_exec_i (void);
-
-    virtual void
-    on_requested_deadline_missed (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::RequestedDeadlineMissedStatus & status);
-
-    virtual void
-    on_sample_lost (
-      ::DDS::DataReader_ptr the_reader,
-      const ::DDS::SampleLostStatus & status);
-  };
-
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -74,6 +36,9 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_get_status (void);
 
+    virtual CCM_DDS::CCM_ConnectorStatusListener_ptr
+    get_status_listener(void);
+
     // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
@@ -100,6 +65,7 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
     bool raw_listener_created_;
     bool listen_port_status_created_;
     bool get_port_status_created_;
+    bool get_status_listener_created_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp
index c5dd1b836fd..913886760a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/descriptors/Plan.cdp
@@ -356,6 +356,22 @@
   </connection>
 
   <connection>
+    <name>connector_status_listener</name>
+    <internalEndpoint>
+      <portName>status_listener</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="Get_Connection_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
     <name>writer_data</name>
     <internalEndpoint>
       <portName>info_write_data</portName>