5 files changed, 21 insertions, 24 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
index 0cb4a376e8e..64d9599254f 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc
@@ -30,7 +30,6 @@ project(HomeT_HomeC_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 project(HomeT_HomeC_lem_stub) : ccm_svnt, dds4ccm_base {
-  avoids += ace_for_tao
   after  += HomeT_HomeC_lem_gen HomeT_HomeC_stub HomeT_Base_stub
   libs   += HomeT_Base_stub HomeT_HomeC_stub
   libpaths += ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
index 9d3f2aab1fd..7057b585457 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl
@@ -14,22 +14,12 @@
 #include "Base/HomeT_Base.idl"
 #include "Connector/HomeT_Connector.idl"
 
-component ConnComp
-{
-};
-
 
-home ConnHome manages ConnComp
+home ConnHome manages ConnComp::DDS_Event
 {
   factory new_ConnComp ();
 };
 
-// Interface for IDL2.x client
-interface IDL2Client {
-//  short get_number ();
-};
-
-
 
 #endif /* HOMET_HOMEC_IDL_ */
 
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 1f675b0d191..c2d69edaacb 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp
@@ -27,7 +27,7 @@
 
 #include "HomeT_HomeC_exec.h"
 #include "./Connector/HomeT_Connector_conn.h"
-
+/*
 namespace CIAO_ConnComp_Impl
 {
 
@@ -111,22 +111,27 @@ namespace CIAO_ConnComp_Impl
   {
   }
 
-  ::Components::EnterpriseComponent_ptr
+  ::Components::EnterpriseComponent_ptr //ConnComp::DDS_Event_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;
   }
 
   // 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,
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 45592fa344e..8cadc2650d9 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h
@@ -37,13 +37,13 @@
 
 #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
@@ -108,12 +108,12 @@ namespace CIAO_ConnComp_Impl
 
     virtual ~ConnHome_exec_i (void);
 
-    virtual ::Components::EnterpriseComponent_ptr
+    virtual ::Components::EnterpriseComponent_ptr //ConnComp::DDS_Event_ptr
     new_ConnComp (void);
 
     // Implicit operations.
 
-    virtual ::Components::EnterpriseComponent_ptr
+    virtual ::Components::EnterpriseComponent_ptr //ConnComp::DDS_Event_ptr
     create (void);
   };
 
diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
index a20e49201e4..de3bd67a2d2 100644
--- a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
+++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp
@@ -73,17 +73,20 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::Object_var obj
         = orb->string_to_object (home_comp_ior_);
 
-      ConnHome_var home
+      ConnHome_var home_comp
         = ConnHome::_narrow (obj.in ());
-      if (CORBA::is_nil (home.in ()))
+      if (CORBA::is_nil (home_comp.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ConnHome objref\n"), -1);
 
       // starting Connector component
-      printf("starting Connector component home->new_ConnComp ()\n");
+      ACE_DEBUG ((LM_DEBUG, "Controller: Starting Connector component home->new_ConnComp ()\n"));
 
-      home->new_ConnComp ();
+      CORBA::Object  * tmp  = home_comp->new_ConnComp ();
 
-      printf("started Connector component home->new_ConnComp ()\n");
+      if (CORBA::is_nil (tmp))
+        ACE_ERROR((LM_ERROR, "Unable to start home_comp->new_ConnComp\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "Controller: Started Connector component home->new_ConnComp ()\n"));
 
       // Place to plug in the rate