3 files changed, 15 insertions, 151 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
index 64d9599254f..62b783c1fa2 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
@@ -9,7 +9,7 @@ project(HomeT_HomeC_idl_gen): componentidldefaults, dds4ccm_ts_default {
               -Wb,skel_export_include=HomeT_HomeC_svnt_export.h \
               -Wb,exec_export_macro=HOMET_HOMEC_EXEC_Export \
               -Wb,exec_export_include=HomeT_HomeC_exec_export.h \
-              -I..
+              -I.. -Gex
 
   IDL_Files {
     HomeT_HomeC.idl
@@ -139,7 +139,7 @@ project(HomeT_HomeC_svnt) : ciao_servant, avoids_ccm_noevent, dds4ccm_base {
 project (HomeT_HomeC_control) : ccm_stub ,  dds4ccm_base{
  after += HomeT_HomeC_stub
   exename = controller
-  libs += HomeT_HomeC_stub HomeT_Base_stub
+  libs += HomeT_HomeC_stub HomeT_Base_stub HomeT_Connector_stub
   includes += ..
   libout = ../lib
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
index c2d69edaacb..86fc7207259 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
@@ -26,77 +26,9 @@
  **/
 
 #include "HomeT_HomeC_exec.h"
-#include "./Connector/HomeT_Connector_conn.h"
-/*
-namespace CIAO_ConnComp_Impl
-{
-
-  // Component Executor Implementation Class: ConnComp_exec_i
-
-
-  ConnComp_exec_i::ConnComp_exec_i (void)
-  {
-  }
-
-  ConnComp_exec_i::~ConnComp_exec_i (void)
-  {
-  }
-
-  // Supported operations and attributes.
-
-  // Component attributes and port operations.
+#include "../Connector/HomeT_Connector_conn.h"
 
-  // Operations from Components::SessionComponent.
-
-  void
-  ConnComp_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->ciao_context_ =
-      ::CCM_ConnComp_Context::_narrow (ctx);
-
-    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  ConnComp_exec_i::configuration_complete (void)
-  {
-
-  }
-
-  void
-  ConnComp_exec_i::ccm_activate (void)
-  {
-  }
-
-  void
-  ConnComp_exec_i::ccm_passivate (void)
-  {
-  }
-
-  void
-  ConnComp_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" HOMET_HOMEC_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ConnComp_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      ConnComp_exec_i);
-
-    return retval;
-  }
-}
-*/
-namespace CIAO_ConnComp_Impl
+namespace CIAO_ConnComp_DDS_Event_Impl
 {
   /**
    * Home Executor Implementation Class: ConnHome_exec_i
@@ -104,38 +36,30 @@ namespace CIAO_ConnComp_Impl
 
   ConnHome_exec_i::ConnHome_exec_i (void)
   {
-    new_ConnComp();
   }
 
   ConnHome_exec_i::~ConnHome_exec_i (void)
   {
   }
 
-  ::Components::EnterpriseComponent_ptr //ConnComp::DDS_Event_ptr
+  ::Components::EnterpriseComponent_ptr
   ConnHome_exec_i::new_ConnComp (void)
   {
-  //  ConnComp::DDS_Event_ptr tmp = 0;
-    ::Components::EnterpriseComponent_ptr tmp = 0;
-
-    printf("ConnHome_exec_i::new_ConnComp  !!!!!!!!!!!1");
     /* Your code here. */
-    //return ::CCM_ConnComp::_nil ();
- //   return CIAO_HomeCompTest_DDS_Event_Impl::create_HomeCompTest_DDS_Event_Impl();
-    return tmp;
+    return ::ConnComp::CCM_DDS_Event::_nil ();
   }
 
   // Implicit operations.
 
- ::Components::EnterpriseComponent_ptr
+  ::Components::EnterpriseComponent_ptr
   ConnHome_exec_i::create (void)
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
-    printf("ConnHome_exec_i::create  !!!!!!!!!!!1");
 
     ACE_NEW_THROW_EX (
       retval,
-      ConnComp_exec_i,
+      CIAO_ConnComp_DDS_Event_Impl::DDS_Event_exec_i,
       ::CORBA::NO_MEMORY ());
 
     return retval;
@@ -147,10 +71,9 @@ namespace CIAO_ConnComp_Impl
     ::Components::HomeExecutorBase_ptr retval =
       ::Components::HomeExecutorBase::_nil ();
 
-    ACE_NEW_RETURN (
+    ACE_NEW_NORETURN (
       retval,
-      ConnHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
+      ConnHome_exec_i);
 
     return retval;
   }
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
index 8cadc2650d9..d1a70139a2f 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
@@ -24,8 +24,8 @@
  * Information about TAO is available at:
  *     http://www.cs.wustl.edu/~schmidt/TAO.html
  **/
-#ifndef CIAO_HOMET_HOMEC_EXEC_MB9IO0_H_
-#define CIAO_HOMET_HOMEC_EXEC_MB9IO0_H_
+#ifndef CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_
+#define CIAO_HOMET_HOMEC_EXEC_P2A1KH_H_
 
 #include /**/ "ace/pre.h"
 
@@ -38,66 +38,7 @@
 #include /**/ "HomeT_HomeC_exec_export.h"
 #include "tao/LocalObject.h"
 
-namespace CIAO_ConnComp_Impl
-{
-
-  //Component Executor Implementation Class: ConnComp_exec_i
-
-/*
-  class ConnComp_exec_i
-    : public virtual ConnComp_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnComp_exec_i (void);
-    virtual ~ConnComp_exec_i (void);
-
-    // @name Supported operations and attributes.
-    //@{
-
-    //@}
-
-    // @name Component attributes and port operations.
-    //@{
-    //@}
-
-    // @name Operations from Components::SessionComponent.
-    //@{
-    virtual void set_session_context (::Components::SessionContext_ptr ctx);
-    virtual void configuration_complete (void);
-    virtual void ccm_activate (void);
-    virtual void ccm_passivate (void);
-    virtual void ccm_remove (void);
-    //@}
-
-    // @name User defined public operations.
-    //@{
-
-    //@}
-
-  private:
-    ::CCM_ConnComp_Context_var ciao_context_;
-
-    // @name Component attributes.
-    //@{
-    //@}
-
-    // @name User defined members.
-    //@{
-
-    //@}
-
-    // @name User defined private operations.
-    //@{
-
-    //@}
-  };
-
-  extern "C" HOMET_HOMEC_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_ConnComp_Impl (void);
-}
-*/
-namespace CIAO_ConnComp_Impl
+namespace CIAO_ConnComp_DDS_Event_Impl
 {
   class HOMET_HOMEC_EXEC_Export ConnHome_exec_i
     : public virtual ConnHome_Exec,
@@ -108,12 +49,12 @@ namespace CIAO_ConnComp_Impl
 
     virtual ~ConnHome_exec_i (void);
 
-    virtual ::Components::EnterpriseComponent_ptr //ConnComp::DDS_Event_ptr
+    virtual ::Components::EnterpriseComponent_ptr
     new_ConnComp (void);
 
     // Implicit operations.
 
-    virtual ::Components::EnterpriseComponent_ptr //ConnComp::DDS_Event_ptr
+    virtual ::Components::EnterpriseComponent_ptr
     create (void);
   };