minor changes for ccm flare test case

6 files changed, 23 insertions, 9 deletions

diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl
index dcfe09005ce..13e6a51d947 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl
@@ -6,7 +6,7 @@ composition session FTClient_Impl
 {
   home executor FTClientHome_Exec
   {
-    implements Simple::FTClientHome;
+    implements DeCoRAM::FTClientHome;
     manages SimpleProvider_Exec;
   };
 };
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl
index 6040b90efb8..0ad5bbe7494 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl
@@ -2,7 +2,7 @@
 
 #include <Components.idl>
 
-module Simple
+module DeCoRAM
 {
   component FTClient
   {
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
index 8d6253eb40f..9f9591a18e5 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
@@ -31,7 +31,7 @@ namespace CIDL_FTClient_Impl
     CORBA::Object_var obj = orb_->resolve_initial_references ("RTCurrent");
     RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (obj);
 
-    rt_current->the_priority (client_executor_->priority ());
+    //    rt_current->the_priority (client_executor_->priority ());
 
     try
       {
@@ -52,7 +52,7 @@ namespace CIDL_FTClient_Impl
     catch (CORBA::SystemException & ex)
       {
         CIAO_DEBUG ((LM_WARNING, 
-                     ACE_TEXT ("FTClient_Timer_Handler::handle_timeout () -"
+                     ACE_TEXT ("FTClient_Timer_Handler::handle_timeout () - "
                                "caught: %s"), ex._info ().c_str ()));
       }
 
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
index f7a6084bce1..1fc9168b453 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
@@ -105,6 +105,12 @@ namespace CIDL_FTClient_Impl
 
     CORBA::Object_var obj = orb_->string_to_object (server_ior);
 
+    if (CORBA::is_nil (obj.in ()))
+      {
+        CIAO_DEBUG ((LM_WARNING,
+                     ACE_TEXT ("FTClient_exec_i::server_ior () : could not resolve server reference.\n")));
+      }
+
     try
       {
         server_ = DeCoRAM::Worker::_narrow (obj.in ());
@@ -132,7 +138,7 @@ namespace CIDL_FTClient_Impl
     ::Components::SessionContext_ptr ctx)
   {
     this->context_ =
-      ::Simple::CCM_FTClient_Context::_narrow (ctx);
+      DeCoRAM::CCM_FTClient_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
     {
@@ -231,7 +237,7 @@ namespace CIDL_FTClient_Impl
   }
 
   extern "C" FTCLIENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_FTClientHome_Impl (void)
+  create_DeCoRAM_FTClientHome_Impl (void)
   {
     ::Components::HomeExecutorBase_ptr retval =
       ::Components::HomeExecutorBase::_nil ();
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
index ec305fbcbee..7a6b2c17256 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
@@ -47,7 +47,6 @@ namespace CIDL_FTClient_Impl
     // Supported or inherited operations.
 
     // Attribute operations.
-
     virtual ::CORBA::Double
     period (void);
 
@@ -92,7 +91,7 @@ namespace CIDL_FTClient_Impl
     virtual void ccm_remove (void);
 
     private:
-    ::Simple::CCM_FTClient_Context_var context_;
+    DeCoRAM::CCM_FTClient_Context_var context_;
     
     // members for attribute implementation
     CORBA::Double period_;
@@ -134,7 +133,7 @@ namespace CIDL_FTClient_Impl
   };
 
   extern "C" FTCLIENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Simple_FTClientHome_Impl (void);
+  create_DeCoRAM_FTClientHome_Impl (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp
index ccce31f683d..9ef1f932318 100644
--- a/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp
@@ -62,6 +62,8 @@ namespace CIDL_FTTask_Impl
 
     start = ACE_OS::gethrtime ();    
 
+    std::cerr << "x";
+
     this->cpu_.run (static_cast <size_t> (execution_time));
 
     end = ACE_OS::gethrtime ();
@@ -328,6 +330,13 @@ namespace CIDL_FTTask_Impl
 	    tnh.bind ("FLARe/" + tnh.escape_dots (this->get_hostname ()) + "/" + 
 		      this->get_process_id () + "/Worker",
 		      ref.in ());
+
+            // and write it to a file
+            std::string iorfilename = object_id_ + ".ior";
+            std::ofstream file (iorfilename.c_str ());
+            file << orb_->object_to_string (ref.in ());
+            file.flush ();
+            file.close ();
 	  }
       }
     catch (Name_Helper_Exception & ex)