Tue Jul 14 11:11:57 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

16 files changed, 32 insertions, 419 deletions

diff --git a/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index 7ed11d6e447..af97a3d6520 100644
--- a/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (Protocols_Controller) : ccm_stub, rtcorba, avoids_ace_for_tao {
+project (Protocols_Controller) : ccm_stub, rtcorba {
   after += Protocols_Sender_stub \
            Protocols_Receiver_stub
   includes += ../Sender
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.cidl b/CIAO/performance-tests/Protocols/Receiver/Receiver.cidl
deleted file mode 100644
index c69fc91d864..00000000000
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.cidl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Receiver.idl"
-
-composition session ReceiverImpl
-{
-  home executor ReceiverHomeExec
-  {
-    implements Protocols::ReceiverHome;
-    manages ReceiverExec;
-  };
-};
-
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 38c01bdc457..c86f184fb29 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -1,36 +1,33 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
 
-project(Protocols_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Protocols_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h
+              -Wb,skel_export_include=Receiver_svnt_export.h \
+              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Receiver_exec_export.h
 
   IDL_Files {
     Receiver.idl
   }
 }
 
-project(Protocols_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Protocols_Receiver_lem_gen) : ciaoidldefaults {
   custom_only = 1
-  cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
-               --svnt-export-include Receiver_svnt_export.h
+  after += Protocols_Receiver_idl_gen
   idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \
               -Wb,export_include=Receiver_exec_export.h \
               -SS
 
-  CIDL_Files {
-    Receiver.cidl
-  }
-
   IDL_Files {
     ReceiverE.idl
   }
 }
 
-project(Protocols_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
+project(Protocols_Receiver_stub) : ccm_stub {
   after += Protocols_Receiver_idl_gen Protocols_stub
   libs  += Protocols_stub
   libpaths += ../common
@@ -55,8 +52,8 @@ project(Protocols_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
   }
 }
 
-project(Protocols_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Protocols_Receiver_cidl_gen Protocols_Receiver_stub
+project(Protocols_Receiver_exec) : ciao_executor {
+  after   += Protocols_Receiver_lem_gen Protocols_Receiver_stub
   sharedname = Protocols_Receiver_exec
   libs += Protocols_Receiver_stub \
           Protocols_stub
@@ -84,7 +81,7 @@ project(Protocols_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
 }
 
 
-project(Protocols_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
+project(Protocols_Receiver_svnt) : ciao_servant {
   after      += Protocols_skel Protocols_Receiver_exec
   sharedname  = Protocols_Receiver_svnt
   libs       += Protocols_Receiver_exec \
@@ -95,9 +92,6 @@ project(Protocols_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
index e1bb4ca3196..baa926d17b0 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.cpp
@@ -241,7 +241,7 @@ namespace CIDL_ReceiverImpl
     ACE_DEBUG ((LM_DEBUG, "ReceiverExec_i::set_session_context\n"));
 
     this->context_ =
-      ReceiverExec_Context::_narrow (ctx);
+      ::CIAO_Protocols_Receiver_Impl::Receiver_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       throw CORBA::INTERNAL ();
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
index 6a4b281e9e9..d5213a5cb92 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec.h
@@ -10,7 +10,7 @@
 namespace CIDL_ReceiverImpl
 {
   class RECEIVER_EXEC_Export ReceiverExec_i :
-    public virtual ReceiverExec,
+    public virtual ::CIAO_Protocols_Receiver_Impl::Receiver_Exec,
     public virtual ::CORBA::LocalObject
   {
   public:
@@ -33,7 +33,7 @@ namespace CIDL_ReceiverImpl
 
   protected:
 
-    ReceiverExec_Context_var context_;
+    ::CIAO_Protocols_Receiver_Impl::Receiver_Exec_Context_var context_;
 
     CORBA::ORB_var orb_;
 
@@ -81,7 +81,7 @@ namespace CIDL_ReceiverImpl
   };
 
   class RECEIVER_EXEC_Export ReceiverHomeExec_i :
-    public virtual ReceiverHomeExec,
+    public virtual ::CIAO_Protocols_Receiver_Impl::ReceiverHome_Exec,
     public virtual ::CORBA::LocalObject
   {
   public:
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec_export.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_exec_export.h
deleted file mode 100644
index 9ae7b9ce799..00000000000
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_EXEC
-// ------------------------------
-#ifndef RECEIVER_EXEC_EXPORT_H
-#define RECEIVER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_EXEC_HAS_DLL)
-#  define RECEIVER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RECEIVER_EXEC_HAS_DLL */
-
-#if !defined (RECEIVER_EXEC_HAS_DLL)
-#  define RECEIVER_EXEC_HAS_DLL 1
-#endif /* ! RECEIVER_EXEC_HAS_DLL */
-
-#if defined (RECEIVER_EXEC_HAS_DLL) && (RECEIVER_EXEC_HAS_DLL == 1)
-#  if defined (RECEIVER_EXEC_BUILD_DLL)
-#    define RECEIVER_EXEC_Export ACE_Proper_Export_Flag
-#    define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_EXEC_BUILD_DLL */
-#    define RECEIVER_EXEC_Export ACE_Proper_Import_Flag
-#    define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_EXEC_BUILD_DLL */
-#else /* RECEIVER_EXEC_HAS_DLL == 1 */
-#  define RECEIVER_EXEC_Export
-#  define RECEIVER_EXEC_SINGLETON_DECLARATION(T)
-#  define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_EXEC_HAS_DLL == 1 */
-
-// Set RECEIVER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_EXEC_NTRACE */
-
-#if (RECEIVER_EXEC_NTRACE == 1)
-#  define RECEIVER_EXEC_TRACE(X)
-#else /* (RECEIVER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_EXEC_NTRACE == 1) */
-
-#endif /* RECEIVER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_stub_export.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_stub_export.h
deleted file mode 100644
index ad411db973f..00000000000
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_STUB
-// ------------------------------
-#ifndef RECEIVER_STUB_EXPORT_H
-#define RECEIVER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_STUB_HAS_DLL)
-#  define RECEIVER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RECEIVER_STUB_HAS_DLL */
-
-#if !defined (RECEIVER_STUB_HAS_DLL)
-#  define RECEIVER_STUB_HAS_DLL 1
-#endif /* ! RECEIVER_STUB_HAS_DLL */
-
-#if defined (RECEIVER_STUB_HAS_DLL) && (RECEIVER_STUB_HAS_DLL == 1)
-#  if defined (RECEIVER_STUB_BUILD_DLL)
-#    define RECEIVER_STUB_Export ACE_Proper_Export_Flag
-#    define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_STUB_BUILD_DLL */
-#    define RECEIVER_STUB_Export ACE_Proper_Import_Flag
-#    define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_STUB_BUILD_DLL */
-#else /* RECEIVER_STUB_HAS_DLL == 1 */
-#  define RECEIVER_STUB_Export
-#  define RECEIVER_STUB_SINGLETON_DECLARATION(T)
-#  define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_STUB_HAS_DLL == 1 */
-
-// Set RECEIVER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_STUB_NTRACE */
-
-#if (RECEIVER_STUB_NTRACE == 1)
-#  define RECEIVER_STUB_TRACE(X)
-#else /* (RECEIVER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_STUB_NTRACE == 1) */
-
-#endif /* RECEIVER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver_svnt_export.h b/CIAO/performance-tests/Protocols/Receiver/Receiver_svnt_export.h
deleted file mode 100644
index 51ed45dc299..00000000000
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RECEIVER_SVNT
-// ------------------------------
-#ifndef RECEIVER_SVNT_EXPORT_H
-#define RECEIVER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (RECEIVER_SVNT_HAS_DLL)
-#  define RECEIVER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && RECEIVER_SVNT_HAS_DLL */
-
-#if !defined (RECEIVER_SVNT_HAS_DLL)
-#  define RECEIVER_SVNT_HAS_DLL 1
-#endif /* ! RECEIVER_SVNT_HAS_DLL */
-
-#if defined (RECEIVER_SVNT_HAS_DLL) && (RECEIVER_SVNT_HAS_DLL == 1)
-#  if defined (RECEIVER_SVNT_BUILD_DLL)
-#    define RECEIVER_SVNT_Export ACE_Proper_Export_Flag
-#    define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RECEIVER_SVNT_BUILD_DLL */
-#    define RECEIVER_SVNT_Export ACE_Proper_Import_Flag
-#    define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RECEIVER_SVNT_BUILD_DLL */
-#else /* RECEIVER_SVNT_HAS_DLL == 1 */
-#  define RECEIVER_SVNT_Export
-#  define RECEIVER_SVNT_SINGLETON_DECLARATION(T)
-#  define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RECEIVER_SVNT_HAS_DLL == 1 */
-
-// Set RECEIVER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RECEIVER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RECEIVER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RECEIVER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RECEIVER_SVNT_NTRACE */
-
-#if (RECEIVER_SVNT_NTRACE == 1)
-#  define RECEIVER_SVNT_TRACE(X)
-#else /* (RECEIVER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define RECEIVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (RECEIVER_SVNT_NTRACE == 1) */
-
-#endif /* RECEIVER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.cidl b/CIAO/performance-tests/Protocols/Sender/Sender.cidl
deleted file mode 100644
index b5be8747d98..00000000000
--- a/CIAO/performance-tests/Protocols/Sender/Sender.cidl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "Sender.idl"
-
-composition session SenderImpl
-{
-  home executor SenderHomeExec
-  {
-    implements Protocols::SenderHome;
-    manages SenderExec;
-  };
-};
-
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 69f68354ae0..6c7540e8361 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -1,36 +1,33 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Sender"
 
-project(Protocols_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Protocols_Sender_idl_gen) : componentidldefaults {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h
+              -Wb,skel_export_include=Sender_svnt_export.h \
+              -Wb,exec_export_macro=SENDER_EXEC_Export \
+              -Wb,exec_export_include=Sender_exec_export.h
 
   IDL_Files {
     Sender.idl
   }
 }
 
-project(Protocols_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Protocols_Sender_lem_gen) : ciaoidldefaults {
   custom_only = 1
-  cidlflags += --svnt-export-macro SENDER_SVNT_Export \
-               --svnt-export-include Sender_svnt_export.h
+  after += Protocols_Sender_idl_gen
   idlflags += -Wb,export_macro=SENDER_EXEC_Export \
               -Wb,export_include=Sender_exec_export.h \
               -SS
 
-  CIDL_Files {
-    Sender.cidl
-  }
-
   IDL_Files {
     SenderE.idl
   }
 }
 
-project(Protocols_Sender_stub) : ccm_stub, avoids_ace_for_tao {
+project(Protocols_Sender_stub) : ccm_stub {
   after += Protocols_Sender_idl_gen Protocols_stub
   libs  += Protocols_stub
   libpaths += ../common
@@ -55,8 +52,8 @@ project(Protocols_Sender_stub) : ccm_stub, avoids_ace_for_tao {
   }
 }
 
-project(Protocols_Sender_exec) : ciao_executor, rtcorba, avoids_ace_for_tao {
-  after   += Protocols_Sender_cidl_gen Protocols_Sender_stub
+project(Protocols_Sender_exec) : ciao_executor, rtcorba {
+  after   += Protocols_Sender_lem_gen Protocols_Sender_stub
   sharedname = Protocols_Sender_exec
   libs += Protocols_Sender_stub \
           Protocols_stub
@@ -86,7 +83,7 @@ project(Protocols_Sender_exec) : ciao_executor, rtcorba, avoids_ace_for_tao {
 }
 
 
-project(Protocols_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
+project(Protocols_Sender_svnt) : ciao_servant {
   after      += Protocols_skel Protocols_Sender_exec
   sharedname  = Protocols_Sender_svnt
   libs       += Protocols_Sender_exec \
@@ -97,9 +94,6 @@ project(Protocols_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
index 942127e8d57..b3cd02897df 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.cpp
@@ -651,7 +651,7 @@ CIDL_SenderImpl::SenderExec_i::set_session_context (
   ACE_DEBUG ((LM_DEBUG, "CIDL_SenderImpl::SenderExec_i::set_session_context\n"));
 
   this->context_ =
-    CIDL_SenderImpl::SenderExec_Context::_narrow (ctx);
+    ::CIAO_Protocols_Sender_Impl::Sender_Exec_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     throw CORBA::INTERNAL ();
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
index 184422716b2..9d2d307a406 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
+++ b/CIAO/performance-tests/Protocols/Sender/Sender_exec.h
@@ -9,7 +9,7 @@ class Custom_Network_Priority_Mapping;
 namespace CIDL_SenderImpl
 {
   class SENDER_EXEC_Export SenderExec_i :
-    public virtual SenderExec,
+    public virtual ::CIAO_Protocols_Sender_Impl::Sender_Exec,
     public virtual ::CORBA::LocalObject
   {
   public:
@@ -42,15 +42,14 @@ namespace CIDL_SenderImpl
     void configuration_complete (void);
 
   protected:
-
-    SenderExec_Context_var context_;
+    ::CIAO_Protocols_Sender_Impl::Sender_Exec_Context_var context_;
 
     CORBA::ORB_var orb_;
 
   };
 
   class SENDER_EXEC_Export SenderHomeExec_i :
-    public virtual SenderHomeExec,
+    public virtual ::CIAO_Protocols_Sender_Impl::SenderHome_Exec,
     public virtual ::CORBA::LocalObject
   {
   public:
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_exec_export.h b/CIAO/performance-tests/Protocols/Sender/Sender_exec_export.h
deleted file mode 100644
index ad4328e98c2..00000000000
--- a/CIAO/performance-tests/Protocols/Sender/Sender_exec_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SENDER_EXEC
-// ------------------------------
-#ifndef SENDER_EXEC_EXPORT_H
-#define SENDER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_EXEC_HAS_DLL)
-#  define SENDER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SENDER_EXEC_HAS_DLL */
-
-#if !defined (SENDER_EXEC_HAS_DLL)
-#  define SENDER_EXEC_HAS_DLL 1
-#endif /* ! SENDER_EXEC_HAS_DLL */
-
-#if defined (SENDER_EXEC_HAS_DLL) && (SENDER_EXEC_HAS_DLL == 1)
-#  if defined (SENDER_EXEC_BUILD_DLL)
-#    define SENDER_EXEC_Export ACE_Proper_Export_Flag
-#    define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SENDER_EXEC_BUILD_DLL */
-#    define SENDER_EXEC_Export ACE_Proper_Import_Flag
-#    define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SENDER_EXEC_BUILD_DLL */
-#else /* SENDER_EXEC_HAS_DLL == 1 */
-#  define SENDER_EXEC_Export
-#  define SENDER_EXEC_SINGLETON_DECLARATION(T)
-#  define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SENDER_EXEC_HAS_DLL == 1 */
-
-// Set SENDER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SENDER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SENDER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SENDER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SENDER_EXEC_NTRACE */
-
-#if (SENDER_EXEC_NTRACE == 1)
-#  define SENDER_EXEC_TRACE(X)
-#else /* (SENDER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SENDER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SENDER_EXEC_NTRACE == 1) */
-
-#endif /* SENDER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_stub_export.h b/CIAO/performance-tests/Protocols/Sender/Sender_stub_export.h
deleted file mode 100644
index c545045ceae..00000000000
--- a/CIAO/performance-tests/Protocols/Sender/Sender_stub_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SENDER_STUB
-// ------------------------------
-#ifndef SENDER_STUB_EXPORT_H
-#define SENDER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_STUB_HAS_DLL)
-#  define SENDER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SENDER_STUB_HAS_DLL */
-
-#if !defined (SENDER_STUB_HAS_DLL)
-#  define SENDER_STUB_HAS_DLL 1
-#endif /* ! SENDER_STUB_HAS_DLL */
-
-#if defined (SENDER_STUB_HAS_DLL) && (SENDER_STUB_HAS_DLL == 1)
-#  if defined (SENDER_STUB_BUILD_DLL)
-#    define SENDER_STUB_Export ACE_Proper_Export_Flag
-#    define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SENDER_STUB_BUILD_DLL */
-#    define SENDER_STUB_Export ACE_Proper_Import_Flag
-#    define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SENDER_STUB_BUILD_DLL */
-#else /* SENDER_STUB_HAS_DLL == 1 */
-#  define SENDER_STUB_Export
-#  define SENDER_STUB_SINGLETON_DECLARATION(T)
-#  define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SENDER_STUB_HAS_DLL == 1 */
-
-// Set SENDER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SENDER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SENDER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SENDER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SENDER_STUB_NTRACE */
-
-#if (SENDER_STUB_NTRACE == 1)
-#  define SENDER_STUB_TRACE(X)
-#else /* (SENDER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SENDER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SENDER_STUB_NTRACE == 1) */
-
-#endif /* SENDER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender_svnt_export.h b/CIAO/performance-tests/Protocols/Sender/Sender_svnt_export.h
deleted file mode 100644
index 3d8729c51fa..00000000000
--- a/CIAO/performance-tests/Protocols/Sender/Sender_svnt_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl SENDER_SVNT
-// ------------------------------
-#ifndef SENDER_SVNT_EXPORT_H
-#define SENDER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SENDER_SVNT_HAS_DLL)
-#  define SENDER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SENDER_SVNT_HAS_DLL */
-
-#if !defined (SENDER_SVNT_HAS_DLL)
-#  define SENDER_SVNT_HAS_DLL 1
-#endif /* ! SENDER_SVNT_HAS_DLL */
-
-#if defined (SENDER_SVNT_HAS_DLL) && (SENDER_SVNT_HAS_DLL == 1)
-#  if defined (SENDER_SVNT_BUILD_DLL)
-#    define SENDER_SVNT_Export ACE_Proper_Export_Flag
-#    define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SENDER_SVNT_BUILD_DLL */
-#    define SENDER_SVNT_Export ACE_Proper_Import_Flag
-#    define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SENDER_SVNT_BUILD_DLL */
-#else /* SENDER_SVNT_HAS_DLL == 1 */
-#  define SENDER_SVNT_Export
-#  define SENDER_SVNT_SINGLETON_DECLARATION(T)
-#  define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SENDER_SVNT_HAS_DLL == 1 */
-
-// Set SENDER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SENDER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SENDER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SENDER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SENDER_SVNT_NTRACE */
-
-#if (SENDER_SVNT_NTRACE == 1)
-#  define SENDER_SVNT_TRACE(X)
-#else /* (SENDER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SENDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SENDER_SVNT_NTRACE == 1) */
-
-#endif /* SENDER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 3dd4a61a2d3..9b0a3f2d6a9 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Protocols_idl_gen) : ciaoidldefaults, anytypecode {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export \
               -Wb,stub_export_include=Protocols_stub_export.h \
@@ -13,7 +13,7 @@ project(Protocols_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   }
 }
 
-project(Protocols_stub) : ccm_stub, avoids_ace_for_tao {
+project(Protocols_stub) : ccm_stub {
   after += Protocols_idl_gen
 
   sharedname = Protocols_stub
@@ -37,7 +37,7 @@ project(Protocols_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 
-project(Protocols_skel) : ciao_executor, avoids_ace_for_tao {
+project(Protocols_skel) : ciao_executor {
   after      +=  Protocols_stub
   sharedname  = Protocols_skel
   libs       += Protocols_stub