ChangeLogTag: Sat Dec 6 04:36:06 UTC 2008 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

15 files changed, 858 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 091c7edf856..266cdba5a24 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,26 @@
+Sat Dec  6 04:36:06 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/FTClientComponent
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient.idl
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_exec_export.h
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
+        * DAnCE/tests/CIAO/FTClientComponent/Test.idl
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_svnt_export.h
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.h
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_stub_export.h
+        * DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp:
+
+          Added client component that makes invocations on the server.
+        
+        * DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
+        * DAnCE/tests/CIAO/FTComponent/Test.idl
+        * DAnCE/tests/CIAO/FTComponent/SimpleFT.idl:
+        
+          Fixed undefined symbols in stub, svnt and exec library.
+
 Sat Nov 15 05:07:51 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl
new file mode 100644
index 00000000000..dcfe09005ce
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.cidl
@@ -0,0 +1,12 @@
+// $Id$
+
+#include "FTClient.idl"
+
+composition session FTClient_Impl
+{
+  home executor FTClientHome_Exec
+  {
+    implements Simple::FTClientHome;
+    manages SimpleProvider_Exec;
+  };
+};
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl
new file mode 100644
index 00000000000..6040b90efb8
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.idl
@@ -0,0 +1,18 @@
+// $Id$
+
+#include <Components.idl>
+
+module Simple
+{
+  component FTClient
+  {
+    attribute double period;
+    attribute double execution_time;
+    attribute unsigned long priority;
+    attribute string server_ior;
+  };
+
+  home FTClientHome manages FTClient
+  {
+  };
+};
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
new file mode 100644
index 00000000000..85ac6a7a72a
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
@@ -0,0 +1,128 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl FTClient"
+
+project(FTClient_idl_gen) : taoidldefaults, anytypecode {
+  avoids += ace_for_tao
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=FTCLIENT_STUB_Export \
+              -Wb,stub_export_include=FTClient_stub_export.h \
+              -Wb,skel_export_macro=FTCLIENT_SVNT_Export \
+              -Wb,skel_export_include=FTClient_svnt_export.h  
+  idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
+
+  IDL_Files {
+    FTClient.idl
+    Test.idl
+  }
+}
+
+project(FTClient_cidl_gen) : ciaocidldefaults, taoidldefaults {
+  avoids += ace_for_tao
+  custom_only = 1
+  cidlflags += --svnt-export-macro FTCLIENT_SVNT_Export \
+               --svnt-export-include FTClient_svnt_export.h
+  idlflags += -Wb,export_macro=FTCLIENT_EXEC_Export \
+              -Wb,export_include=FTClient_exec_export.h \
+              -SS
+
+  idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
+  cidlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
+              
+  CIDL_Files {
+    FTClient.cidl
+  }
+  
+  IDL_Files {
+    FTClientE.idl
+  }
+}
+
+project(FTClient_stub) : ccm_stub {
+  avoids += ace_for_tao
+  after += FTClient_idl_gen 
+  
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
+
+  sharedname = FTClient_stub
+  dynamicflags   = FTCLIENT_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    FTClientC.cpp
+    TestC.cpp
+  }
+
+  Header_Files {
+    FTClientC.h
+    FTClient_stub_export.h
+  }
+
+  Inline_Files {
+    FTClientC.inl
+  }
+}
+
+project(FTClient_exec) : ciao_executor, ciao_container_base, orbsvcslib {
+  avoids += ace_for_tao
+  after   += FTClient_cidl_gen FTClient_stub
+  sharedname = FTClient_exec
+  libs += FTClient_stub
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
+  dynamicflags   = FTCLIENT_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    FTClientEC.cpp
+    FTClient_exec.cpp
+    FTClient_Timer_Handler.cpp
+  }
+  
+  Header_Files {
+    FTClientEC.h
+    FTClient_exec.h
+    FTClient_exec_export.h
+    FTClient_Timer_Handler.h
+  }
+  
+  Inline_Files {
+    FTClientEC.inl
+  }
+}
+
+
+project(FTClient_svnt) : ciao_servant {
+  avoids += ace_for_tao
+  after      +=  FTClient_exec
+  sharedname  = FTClient_svnt
+  libs       += FTClient_exec \
+                FTClient_stub 
+
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs/LWFT
+  dynamicflags = FTCLIENT_SVNT_BUILD_DLL
+  
+  CIDL_Files {
+  }
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    FTClientS.cpp
+    FTClient_svnt.cpp
+    TestS.cpp
+  }
+  
+  Header_Files {
+    FTClientS.h
+    FTClient_svnt.h
+    FTClient_svnt_export.h
+  }
+  
+  Inline_Files {
+    FTClientS.inl
+  }
+}
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
new file mode 100644
index 00000000000..d4f76cb3317
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
@@ -0,0 +1,64 @@
+// $Id$
+
+#include <ace/High_Res_Timer.h>
+#include <tao/RTCORBA/RTCORBA.h>
+#include <ciao/CIAO_common.h>
+#include "FTClient_Timer_Handler.h"
+#include "TestC.h"
+#include "FTClient_exec.h"
+
+namespace CIDL_FTClient_Impl
+{
+
+  FTClient_Timer_Handler::FTClient_Timer_Handler (
+    CIDL_FTClient_Impl::FTClient_exec_i * client_executor)
+    : client_executor_ (client_executor)
+  {
+  }
+
+  void
+  FTClient_Timer_Handler::set_orb (CORBA::ORB_ptr orb)
+  {
+    orb_ = CORBA::ORB::_duplicate (orb);
+  }
+
+  int
+  FTClient_Timer_Handler::handle_timeout (const ACE_Time_Value &,
+                                          const void *)
+  {
+    test_var server = client_executor_->server ();
+
+    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 ());
+
+    try
+      {
+        ACE_hrtime_t start = ACE_OS::gethrtime ();
+
+        // we have to do some profiling first to see how we can achieve
+        // the correct execution time.
+        server->method (0, 0, 
+                        static_cast<CORBA::ULong> (client_executor_->execution_time ()), 
+                        201827, 0);
+        
+        ACE_hrtime_t end = ACE_OS::gethrtime ();
+        
+        CIAO_DEBUG ((LM_DEBUG,
+                     ACE_TEXT ("FTClient_Timer_Handler::handle_timeout () -"
+                               "response time for %f was %d.\n"),
+                     client_executor_->execution_time (),
+                     end - start));
+      }
+    catch (CORBA::SystemException & ex)
+      {
+        CIAO_DEBUG ((LM_WARNING, 
+                     ACE_TEXT ("FTClient_Timer_Handler::handle_timeout () -"
+                               "caught: %s"), ex._info ().c_str ()));
+      }
+
+    return 0;
+  }
+    
+} // end namespace CIDL_FTClient_Impl
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.h
new file mode 100644
index 00000000000..a22592b0398
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.h
@@ -0,0 +1,34 @@
+// $Id$
+
+#ifndef FTCLIENT_TIMER_HANDLER_H_
+#define FTCLIENT_TIMER_HANDLER_H_
+
+#include "ace/Event_Handler.h"
+#include "tao/ORB.h"
+
+namespace CIDL_FTClient_Impl
+{
+
+  // forward declaration
+  class FTClient_exec_i;
+
+  class FTClient_Timer_Handler : public ACE_Event_Handler
+  {
+  public:
+    FTClient_Timer_Handler (CIDL_FTClient_Impl::FTClient_exec_i * client_executor);
+    
+    void set_orb (CORBA::ORB_ptr orb);
+
+    // Hook method that is called by the reactor when a timer expires.
+    virtual int handle_timeout (const ACE_Time_Value &tv,
+                                const void *);
+    
+  private:
+    FTClient_exec_i * client_executor_;
+
+    CORBA::ORB_var orb_;
+  };
+
+} // end namespace CIDL_FTClient_Impl
+
+#endif /* FTCLIENT_TIMER_HANDLER_H_ */
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
new file mode 100644
index 00000000000..edf02aff595
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
@@ -0,0 +1,246 @@
+// $Id$
+//
+// ****              Code generated by the                 ****
+// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
+// CIAO has been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// CIDL Compiler has been developed by:
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about CIAO is available at:
+//    http://www.dre.vanderbilt.edu/CIAO
+
+#include "FTClient_exec.h"
+#include "FTClient_svnt.h"
+#include "ace/Reactor.h"
+#include "tao/ORB_Core.h"
+#include "ciao/CIAO_common.h"
+#include "ciao/Containers/Container_Base.h"
+#include "FTClient_Timer_Handler.h"
+
+namespace CIDL_FTClient_Impl
+{
+  //==================================================================
+  // Component Executor Implementation Class:   FTClient_exec_i
+  //==================================================================
+
+  FTClient_exec_i::FTClient_exec_i (void)
+    : period_ (0.0),
+      execution_time_ (0.0),
+      priority_ (0),
+      server_ (test::_nil ()),
+      orb_ (CORBA::ORB::_nil ()),
+      timeout_handler_ (this)
+  {
+  }
+
+  FTClient_exec_i::~FTClient_exec_i (void)
+  {
+  }
+
+  // Supported or inherited operations.
+
+  // Attribute operations.
+
+  ::CORBA::Double
+  FTClient_exec_i::period ()
+  {
+    // Your code here.
+    return period_;
+  }
+
+  void
+  FTClient_exec_i::period (::CORBA::Double period)
+  {
+    period_ = period;
+  }
+
+  ::CORBA::Double
+  FTClient_exec_i::execution_time ()
+  {
+    return execution_time_;
+  }
+
+  void
+  FTClient_exec_i::execution_time (::CORBA::Double execution_time)
+  {
+    execution_time_ = execution_time;
+  }
+
+  ::CORBA::ULong
+  FTClient_exec_i::priority ()
+  {
+    return priority_;
+  }
+
+  void
+  FTClient_exec_i::priority (::CORBA::ULong priority)
+  {
+    priority_ = priority;
+  }
+
+  char *
+  FTClient_exec_i::server_ior ()
+  {
+    return orb_->object_to_string (server_.in ());
+  }
+
+  void
+  FTClient_exec_i::server_ior (const char * server_ior)
+  {
+    if (CORBA::is_nil (orb_.in ()))
+      {
+        CIAO_DEBUG ((LM_WARNING, 
+                     ACE_TEXT ("FTClient_exec_i::server_ior () : ORB is nil.\n")));
+        return;
+      }
+
+    CORBA::Object_var obj = orb_->string_to_object (server_ior);
+
+    try
+      {
+        server_ = test::_narrow (obj.in ());
+      }
+    catch (CORBA::SystemException & ex)
+      {
+        CIAO_DEBUG ((LM_WARNING, 
+                     ACE_TEXT ("FTClient_exec_i::server_ior () : caught %s\n"), 
+                     ex._info ().c_str ()));
+      }
+  }
+
+  test_ptr 
+  FTClient_exec_i::server (void)
+  {
+    return test::_duplicate (server_.in ());
+  }
+
+  // Port operations.
+
+  // Operations from Components::SessionComponent
+
+  void
+  FTClient_exec_i::set_session_context (
+    ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      ::Simple::CCM_FTClient_Context::_narrow (ctx);
+
+    if (CORBA::is_nil (this->context_.in ()))
+    {
+      throw ::CORBA::INTERNAL ();
+    }
+
+    CIDL_FTClient_Impl::FTClient_Context * ft_context = 
+      CIDL_FTClient_Impl::FTClient_Context::_narrow (context_.in ());
+
+    if (0 == ft_context)
+      {
+	CIAO_ERROR ((LM_ERROR, "could not narrow to SimpleFT_Context\n"));
+	return;
+      }
+
+    CIAO::Container_var container = ft_context->_ciao_the_Container ();
+
+    CIAO::Container_i * ci = dynamic_cast <CIAO::Container_i*> (container.in ());
+
+    if (ci == 0)
+      {
+	CIAO_ERROR ((LM_WARNING, "could not cast to Container_i\n"));
+	return;
+      }
+
+    orb_ = ci->the_ORB ();
+
+    timeout_handler_.set_orb (orb_.in ());
+  }
+
+  void
+  FTClient_exec_i::configuration_complete ()
+  {
+    // Your code here.
+  }
+
+  void
+  FTClient_exec_i::ccm_activate ()
+  {
+    // register the timer handler with the ORB reactor
+    ACE_Time_Value period;
+    period.msec (static_cast<long> (period_));
+
+    orb_->orb_core ()->reactor ()->schedule_timer (&timeout_handler_,
+                                                   0,
+                                                   ACE_Time_Value::zero,
+                                                   period);
+  }
+
+  void
+  FTClient_exec_i::ccm_passivate ()
+  {
+    orb_->orb_core ()->reactor ()->cancel_timer (&timeout_handler_);
+  }
+
+  void
+  FTClient_exec_i::ccm_remove ()
+  {
+    // Your code here.
+  }
+
+  //==================================================================
+  // Home Executor Implementation Class:   FTClientHome_exec_i
+  //==================================================================
+
+  FTClientHome_exec_i::FTClientHome_exec_i (void)
+  {
+  }
+
+  FTClientHome_exec_i::~FTClientHome_exec_i (void)
+  {
+  }
+
+  // Supported or inherited operations.
+
+  // Home operations.
+
+  // Factory and finder operations.
+
+  // Attribute operations.
+
+  // Implicit operations.
+
+  ::Components::EnterpriseComponent_ptr
+  FTClientHome_exec_i::create ()
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_THROW_EX (
+      retval,
+      FTClient_exec_i,
+      ::CORBA::NO_MEMORY ());
+
+    return retval;
+  }
+
+  extern "C" FTCLIENT_EXEC_Export ::Components::HomeExecutorBase_ptr
+  create_Simple_FTClientHome_Impl (void)
+  {
+    ::Components::HomeExecutorBase_ptr retval =
+      ::Components::HomeExecutorBase::_nil ();
+
+    ACE_NEW_RETURN (
+      retval,
+      FTClientHome_exec_i,
+      ::Components::HomeExecutorBase::_nil ());
+
+    return retval;
+  }
+}
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
new file mode 100644
index 00000000000..5d437390cdf
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
@@ -0,0 +1,142 @@
+// $Id$
+//
+// ****              Code generated by the                 ****
+// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
+// CIAO has been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// CIDL Compiler has been developed by:
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about CIAO is available at:
+//    http://www.dre.vanderbilt.edu/CIAO
+
+#ifndef CIAO_FTCLIENT_EXEC_H
+#define CIAO_FTCLIENT_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "FTClientEC.h"
+#include "TestC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "FTClient_exec_export.h"
+#include "tao/LocalObject.h"
+#include "FTClient_Timer_Handler.h"
+
+namespace CIDL_FTClient_Impl
+{
+  class FTCLIENT_EXEC_Export FTClient_exec_i
+    : public virtual SimpleProvider_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+    public:
+    FTClient_exec_i (void);
+    virtual ~FTClient_exec_i (void);
+
+    // Supported or inherited operations.
+
+    // Attribute operations.
+
+    virtual ::CORBA::Double
+    period (void);
+
+    virtual void
+    period (::CORBA::Double period);
+
+    virtual ::CORBA::Double
+    execution_time (void);
+
+    virtual void
+    execution_time (::CORBA::Double execution_time);
+
+    virtual ::CORBA::ULong
+    priority (void);
+
+    virtual void
+    priority (::CORBA::ULong priority);
+
+    virtual char *
+    server_ior (void);
+
+    virtual void
+    server_ior (const char * server_ior);
+
+    // returns the reference to the server
+    test_ptr server (void);
+    
+    // Port operations.
+
+    // 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);
+
+    private:
+    ::Simple::CCM_FTClient_Context_var context_;
+    
+    // members for attribute implementation
+    CORBA::Double period_;
+
+    CORBA::Double execution_time_;
+
+    CORBA::ULong priority_;
+
+    test_var server_;
+
+    CORBA::ORB_var orb_;
+
+    // event handler that allows a repeated scheduling 
+    // of calls tot the server
+    FTClient_Timer_Handler timeout_handler_;
+    
+  };
+
+  class FTCLIENT_EXEC_Export FTClientHome_exec_i
+    : public virtual FTClientHome_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+    public:
+    FTClientHome_exec_i (void);
+    virtual ~FTClientHome_exec_i (void);
+
+    // Supported or inherited operations.
+
+    // Home operations.
+
+    // Factory and finder operations.
+
+    // Attribute operations.
+
+    // Implicit operations.
+
+    virtual ::Components::EnterpriseComponent_ptr
+    create (void);
+  };
+
+  extern "C" FTCLIENT_EXEC_Export ::Components::HomeExecutorBase_ptr
+  create_Simple_FTClientHome_Impl (void);
+};
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_FTCLIENT_EXEC_H */
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec_export.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec_export.h
new file mode 100644
index 00000000000..3874ee3958a
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl FTCLIENT_EXEC
+// ------------------------------
+#ifndef FTCLIENT_EXEC_EXPORT_H
+#define FTCLIENT_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FTCLIENT_EXEC_HAS_DLL)
+#  define FTCLIENT_EXEC_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FTCLIENT_EXEC_HAS_DLL */
+
+#if !defined (FTCLIENT_EXEC_HAS_DLL)
+#  define FTCLIENT_EXEC_HAS_DLL 1
+#endif /* ! FTCLIENT_EXEC_HAS_DLL */
+
+#if defined (FTCLIENT_EXEC_HAS_DLL) && (FTCLIENT_EXEC_HAS_DLL == 1)
+#  if defined (FTCLIENT_EXEC_BUILD_DLL)
+#    define FTCLIENT_EXEC_Export ACE_Proper_Export_Flag
+#    define FTCLIENT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define FTCLIENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* FTCLIENT_EXEC_BUILD_DLL */
+#    define FTCLIENT_EXEC_Export ACE_Proper_Import_Flag
+#    define FTCLIENT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define FTCLIENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* FTCLIENT_EXEC_BUILD_DLL */
+#else /* FTCLIENT_EXEC_HAS_DLL == 1 */
+#  define FTCLIENT_EXEC_Export
+#  define FTCLIENT_EXEC_SINGLETON_DECLARATION(T)
+#  define FTCLIENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* FTCLIENT_EXEC_HAS_DLL == 1 */
+
+// Set FTCLIENT_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (FTCLIENT_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define FTCLIENT_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define FTCLIENT_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !FTCLIENT_EXEC_NTRACE */
+
+#if (FTCLIENT_EXEC_NTRACE == 1)
+#  define FTCLIENT_EXEC_TRACE(X)
+#else /* (FTCLIENT_EXEC_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define FTCLIENT_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (FTCLIENT_EXEC_NTRACE == 1) */
+
+#endif /* FTCLIENT_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_stub_export.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_stub_export.h
new file mode 100644
index 00000000000..0e508c30d80
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_stub_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl FTCLIENT_STUB
+// ------------------------------
+#ifndef FTCLIENT_STUB_EXPORT_H
+#define FTCLIENT_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FTCLIENT_STUB_HAS_DLL)
+#  define FTCLIENT_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FTCLIENT_STUB_HAS_DLL */
+
+#if !defined (FTCLIENT_STUB_HAS_DLL)
+#  define FTCLIENT_STUB_HAS_DLL 1
+#endif /* ! FTCLIENT_STUB_HAS_DLL */
+
+#if defined (FTCLIENT_STUB_HAS_DLL) && (FTCLIENT_STUB_HAS_DLL == 1)
+#  if defined (FTCLIENT_STUB_BUILD_DLL)
+#    define FTCLIENT_STUB_Export ACE_Proper_Export_Flag
+#    define FTCLIENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define FTCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* FTCLIENT_STUB_BUILD_DLL */
+#    define FTCLIENT_STUB_Export ACE_Proper_Import_Flag
+#    define FTCLIENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define FTCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* FTCLIENT_STUB_BUILD_DLL */
+#else /* FTCLIENT_STUB_HAS_DLL == 1 */
+#  define FTCLIENT_STUB_Export
+#  define FTCLIENT_STUB_SINGLETON_DECLARATION(T)
+#  define FTCLIENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* FTCLIENT_STUB_HAS_DLL == 1 */
+
+// Set FTCLIENT_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (FTCLIENT_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define FTCLIENT_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define FTCLIENT_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !FTCLIENT_STUB_NTRACE */
+
+#if (FTCLIENT_STUB_NTRACE == 1)
+#  define FTCLIENT_STUB_TRACE(X)
+#else /* (FTCLIENT_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define FTCLIENT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (FTCLIENT_STUB_NTRACE == 1) */
+
+#endif /* FTCLIENT_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_svnt_export.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_svnt_export.h
new file mode 100644
index 00000000000..6e628fd8084
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_svnt_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl FTCLIENT_SVNT
+// ------------------------------
+#ifndef FTCLIENT_SVNT_EXPORT_H
+#define FTCLIENT_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (FTCLIENT_SVNT_HAS_DLL)
+#  define FTCLIENT_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && FTCLIENT_SVNT_HAS_DLL */
+
+#if !defined (FTCLIENT_SVNT_HAS_DLL)
+#  define FTCLIENT_SVNT_HAS_DLL 1
+#endif /* ! FTCLIENT_SVNT_HAS_DLL */
+
+#if defined (FTCLIENT_SVNT_HAS_DLL) && (FTCLIENT_SVNT_HAS_DLL == 1)
+#  if defined (FTCLIENT_SVNT_BUILD_DLL)
+#    define FTCLIENT_SVNT_Export ACE_Proper_Export_Flag
+#    define FTCLIENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define FTCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* FTCLIENT_SVNT_BUILD_DLL */
+#    define FTCLIENT_SVNT_Export ACE_Proper_Import_Flag
+#    define FTCLIENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define FTCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* FTCLIENT_SVNT_BUILD_DLL */
+#else /* FTCLIENT_SVNT_HAS_DLL == 1 */
+#  define FTCLIENT_SVNT_Export
+#  define FTCLIENT_SVNT_SINGLETON_DECLARATION(T)
+#  define FTCLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* FTCLIENT_SVNT_HAS_DLL == 1 */
+
+// Set FTCLIENT_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (FTCLIENT_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define FTCLIENT_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define FTCLIENT_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !FTCLIENT_SVNT_NTRACE */
+
+#if (FTCLIENT_SVNT_NTRACE == 1)
+#  define FTCLIENT_SVNT_TRACE(X)
+#else /* (FTCLIENT_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define FTCLIENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (FTCLIENT_SVNT_NTRACE == 1) */
+
+#endif /* FTCLIENT_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/Test.idl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/Test.idl
new file mode 100644
index 00000000000..a1696e22ce9
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/Test.idl
@@ -0,0 +1,11 @@
+interface test
+{
+    void method (in unsigned long test_start,
+                 in unsigned long test_end,
+                 in unsigned long work,
+                 in unsigned long prime_number, 
+                 in unsigned long end);
+    
+   void shutdown ();
+   void dump ();
+};
diff --git a/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.idl b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.idl
index 7c859dbbfef..6331e19c7ad 100644
--- a/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.idl
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.idl
@@ -1,11 +1,12 @@
 // $Id$
 
 #include <Components.idl>
+#include <ReplicatedApplication.idl>
 #include "Test.idl"
 
 module Simple
 {
-  component SimpleFT supports test
+  component SimpleFT supports test, ReplicatedApplication
   {
     attribute Object COMPONENT_REFERENCE;
     attribute string object_id;
diff --git a/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
index 1ee18987e4e..0a4e3e9abb7 100644
--- a/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/SimpleFT.mpc
@@ -45,6 +45,7 @@ project(SimpleFT_stub) : ccm_stub {
 
   sharedname = SimpleFT_stub
   dynamicflags   = SIMPLEFT_STUB_BUILD_DLL
+  libs += LWFT_Common
 
   IDL_Files {
   }
@@ -64,7 +65,7 @@ project(SimpleFT_stub) : ccm_stub {
   }
 }
 
-project(SimpleFT_exec) : ciao_executor, orbsvcslib {
+project(SimpleFT_exec) : ciao_executor, ciao_container_base, naming, orbsvcslib {
   avoids += ace_for_tao
   after   += SimpleFT_cidl_gen SimpleFT_stub
   sharedname = SimpleFT_exec
@@ -92,7 +93,7 @@ project(SimpleFT_exec) : ciao_executor, orbsvcslib {
 }
 
 
-project(SimpleFT_svnt) : ciao_servant {
+project(SimpleFT_svnt) : ciao_servant, naming {
   avoids += ace_for_tao
   after      +=  SimpleFT_exec
   sharedname  = SimpleFT_svnt
diff --git a/CIAO/DAnCE/tests/CIAO/FTComponent/Test.idl b/CIAO/DAnCE/tests/CIAO/FTComponent/Test.idl
index 4fee003011c..a1696e22ce9 100644
--- a/CIAO/DAnCE/tests/CIAO/FTComponent/Test.idl
+++ b/CIAO/DAnCE/tests/CIAO/FTComponent/Test.idl
@@ -1,6 +1,4 @@
-#include <ReplicatedApplication.idl>
-
-interface test : ReplicatedApplication
+interface test
 {
     void method (in unsigned long test_start,
                  in unsigned long test_end,