ChangeLogTag: Tue Sep 22 22:17:57 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

32 files changed, 42 insertions, 1684 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index e3bf0650dac..e81ec30edd7 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,42 @@
+Tue Sep 22 22:17:57 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/ProcessColocation_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h:
+        * DAnCE/tests/CIAO/Components/ProcessColocation_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h:
+        * DAnCE/tests/CIAO/Components/ProcessColocation_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h:
+        * DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h:
+
+          Removed these files, now generated.
+
+        * DAnCE/tests/CIAO/Components/SimpleCommon.mpc:
+        * DAnCE/tests/CIAO/Components/SimpleProvider.mpc:
+
+          MPC project changes.
+
 Tue Sep 22 21:45:42 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h:
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_exec_export.h
deleted file mode 100644
index 8b0e25ff9ba..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_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 PROCESSCOLOCATION_EXEC
-// ------------------------------
-#ifndef PROCESSCOLOCATION_EXEC_EXPORT_H
-#define PROCESSCOLOCATION_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PROCESSCOLOCATION_EXEC_HAS_DLL)
-#  define PROCESSCOLOCATION_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PROCESSCOLOCATION_EXEC_HAS_DLL */
-
-#if !defined (PROCESSCOLOCATION_EXEC_HAS_DLL)
-#  define PROCESSCOLOCATION_EXEC_HAS_DLL 1
-#endif /* ! PROCESSCOLOCATION_EXEC_HAS_DLL */
-
-#if defined (PROCESSCOLOCATION_EXEC_HAS_DLL) && (PROCESSCOLOCATION_EXEC_HAS_DLL == 1)
-#  if defined (PROCESSCOLOCATION_EXEC_BUILD_DLL)
-#    define PROCESSCOLOCATION_EXEC_Export ACE_Proper_Export_Flag
-#    define PROCESSCOLOCATION_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROCESSCOLOCATION_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROCESSCOLOCATION_EXEC_BUILD_DLL */
-#    define PROCESSCOLOCATION_EXEC_Export ACE_Proper_Import_Flag
-#    define PROCESSCOLOCATION_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROCESSCOLOCATION_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROCESSCOLOCATION_EXEC_BUILD_DLL */
-#else /* PROCESSCOLOCATION_EXEC_HAS_DLL == 1 */
-#  define PROCESSCOLOCATION_EXEC_Export
-#  define PROCESSCOLOCATION_EXEC_SINGLETON_DECLARATION(T)
-#  define PROCESSCOLOCATION_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROCESSCOLOCATION_EXEC_HAS_DLL == 1 */
-
-// Set PROCESSCOLOCATION_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROCESSCOLOCATION_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROCESSCOLOCATION_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROCESSCOLOCATION_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROCESSCOLOCATION_EXEC_NTRACE */
-
-#if (PROCESSCOLOCATION_EXEC_NTRACE == 1)
-#  define PROCESSCOLOCATION_EXEC_TRACE(X)
-#else /* (PROCESSCOLOCATION_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROCESSCOLOCATION_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROCESSCOLOCATION_EXEC_NTRACE == 1) */
-
-#endif /* PROCESSCOLOCATION_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_stub_export.h
deleted file mode 100644
index 15041a8225b..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_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 PROCESSCOLOCATION_STUB
-// ------------------------------
-#ifndef PROCESSCOLOCATION_STUB_EXPORT_H
-#define PROCESSCOLOCATION_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PROCESSCOLOCATION_STUB_HAS_DLL)
-#  define PROCESSCOLOCATION_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PROCESSCOLOCATION_STUB_HAS_DLL */
-
-#if !defined (PROCESSCOLOCATION_STUB_HAS_DLL)
-#  define PROCESSCOLOCATION_STUB_HAS_DLL 1
-#endif /* ! PROCESSCOLOCATION_STUB_HAS_DLL */
-
-#if defined (PROCESSCOLOCATION_STUB_HAS_DLL) && (PROCESSCOLOCATION_STUB_HAS_DLL == 1)
-#  if defined (PROCESSCOLOCATION_STUB_BUILD_DLL)
-#    define PROCESSCOLOCATION_STUB_Export ACE_Proper_Export_Flag
-#    define PROCESSCOLOCATION_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROCESSCOLOCATION_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROCESSCOLOCATION_STUB_BUILD_DLL */
-#    define PROCESSCOLOCATION_STUB_Export ACE_Proper_Import_Flag
-#    define PROCESSCOLOCATION_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROCESSCOLOCATION_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROCESSCOLOCATION_STUB_BUILD_DLL */
-#else /* PROCESSCOLOCATION_STUB_HAS_DLL == 1 */
-#  define PROCESSCOLOCATION_STUB_Export
-#  define PROCESSCOLOCATION_STUB_SINGLETON_DECLARATION(T)
-#  define PROCESSCOLOCATION_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROCESSCOLOCATION_STUB_HAS_DLL == 1 */
-
-// Set PROCESSCOLOCATION_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROCESSCOLOCATION_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROCESSCOLOCATION_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROCESSCOLOCATION_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROCESSCOLOCATION_STUB_NTRACE */
-
-#if (PROCESSCOLOCATION_STUB_NTRACE == 1)
-#  define PROCESSCOLOCATION_STUB_TRACE(X)
-#else /* (PROCESSCOLOCATION_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROCESSCOLOCATION_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROCESSCOLOCATION_STUB_NTRACE == 1) */
-
-#endif /* PROCESSCOLOCATION_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_svnt_export.h
deleted file mode 100644
index d5a2184f0dc..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation_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 PROCESSCOLOCATION_SVNT
-// ------------------------------
-#ifndef PROCESSCOLOCATION_SVNT_EXPORT_H
-#define PROCESSCOLOCATION_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PROCESSCOLOCATION_SVNT_HAS_DLL)
-#  define PROCESSCOLOCATION_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PROCESSCOLOCATION_SVNT_HAS_DLL */
-
-#if !defined (PROCESSCOLOCATION_SVNT_HAS_DLL)
-#  define PROCESSCOLOCATION_SVNT_HAS_DLL 1
-#endif /* ! PROCESSCOLOCATION_SVNT_HAS_DLL */
-
-#if defined (PROCESSCOLOCATION_SVNT_HAS_DLL) && (PROCESSCOLOCATION_SVNT_HAS_DLL == 1)
-#  if defined (PROCESSCOLOCATION_SVNT_BUILD_DLL)
-#    define PROCESSCOLOCATION_SVNT_Export ACE_Proper_Export_Flag
-#    define PROCESSCOLOCATION_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PROCESSCOLOCATION_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* PROCESSCOLOCATION_SVNT_BUILD_DLL */
-#    define PROCESSCOLOCATION_SVNT_Export ACE_Proper_Import_Flag
-#    define PROCESSCOLOCATION_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PROCESSCOLOCATION_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* PROCESSCOLOCATION_SVNT_BUILD_DLL */
-#else /* PROCESSCOLOCATION_SVNT_HAS_DLL == 1 */
-#  define PROCESSCOLOCATION_SVNT_Export
-#  define PROCESSCOLOCATION_SVNT_SINGLETON_DECLARATION(T)
-#  define PROCESSCOLOCATION_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* PROCESSCOLOCATION_SVNT_HAS_DLL == 1 */
-
-// Set PROCESSCOLOCATION_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (PROCESSCOLOCATION_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define PROCESSCOLOCATION_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define PROCESSCOLOCATION_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !PROCESSCOLOCATION_SVNT_NTRACE */
-
-#if (PROCESSCOLOCATION_SVNT_NTRACE == 1)
-#  define PROCESSCOLOCATION_SVNT_TRACE(X)
-#else /* (PROCESSCOLOCATION_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define PROCESSCOLOCATION_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (PROCESSCOLOCATION_SVNT_NTRACE == 1) */
-
-#endif /* PROCESSCOLOCATION_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h
deleted file mode 100644
index 1b9481804a3..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_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 SIMPLEATTRIBUTE_EXEC
-// ------------------------------
-#ifndef SIMPLEATTRIBUTE_EXEC_EXPORT_H
-#define SIMPLEATTRIBUTE_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEATTRIBUTE_EXEC_HAS_DLL)
-#  define SIMPLEATTRIBUTE_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEATTRIBUTE_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEATTRIBUTE_EXEC_HAS_DLL)
-#  define SIMPLEATTRIBUTE_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEATTRIBUTE_EXEC_HAS_DLL */
-
-#if defined (SIMPLEATTRIBUTE_EXEC_HAS_DLL) && (SIMPLEATTRIBUTE_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEATTRIBUTE_EXEC_BUILD_DLL)
-#    define SIMPLEATTRIBUTE_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEATTRIBUTE_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEATTRIBUTE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEATTRIBUTE_EXEC_BUILD_DLL */
-#    define SIMPLEATTRIBUTE_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEATTRIBUTE_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEATTRIBUTE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEATTRIBUTE_EXEC_BUILD_DLL */
-#else /* SIMPLEATTRIBUTE_EXEC_HAS_DLL == 1 */
-#  define SIMPLEATTRIBUTE_EXEC_Export
-#  define SIMPLEATTRIBUTE_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEATTRIBUTE_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEATTRIBUTE_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEATTRIBUTE_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEATTRIBUTE_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEATTRIBUTE_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEATTRIBUTE_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEATTRIBUTE_EXEC_NTRACE */
-
-#if (SIMPLEATTRIBUTE_EXEC_NTRACE == 1)
-#  define SIMPLEATTRIBUTE_EXEC_TRACE(X)
-#else /* (SIMPLEATTRIBUTE_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEATTRIBUTE_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEATTRIBUTE_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEATTRIBUTE_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h
deleted file mode 100644
index 00e32efd226..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_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 SIMPLEATTRIBUTE_STUB
-// ------------------------------
-#ifndef SIMPLEATTRIBUTE_STUB_EXPORT_H
-#define SIMPLEATTRIBUTE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEATTRIBUTE_STUB_HAS_DLL)
-#  define SIMPLEATTRIBUTE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEATTRIBUTE_STUB_HAS_DLL */
-
-#if !defined (SIMPLEATTRIBUTE_STUB_HAS_DLL)
-#  define SIMPLEATTRIBUTE_STUB_HAS_DLL 1
-#endif /* ! SIMPLEATTRIBUTE_STUB_HAS_DLL */
-
-#if defined (SIMPLEATTRIBUTE_STUB_HAS_DLL) && (SIMPLEATTRIBUTE_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEATTRIBUTE_STUB_BUILD_DLL)
-#    define SIMPLEATTRIBUTE_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEATTRIBUTE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEATTRIBUTE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEATTRIBUTE_STUB_BUILD_DLL */
-#    define SIMPLEATTRIBUTE_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEATTRIBUTE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEATTRIBUTE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEATTRIBUTE_STUB_BUILD_DLL */
-#else /* SIMPLEATTRIBUTE_STUB_HAS_DLL == 1 */
-#  define SIMPLEATTRIBUTE_STUB_Export
-#  define SIMPLEATTRIBUTE_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEATTRIBUTE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEATTRIBUTE_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEATTRIBUTE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEATTRIBUTE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEATTRIBUTE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEATTRIBUTE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEATTRIBUTE_STUB_NTRACE */
-
-#if (SIMPLEATTRIBUTE_STUB_NTRACE == 1)
-#  define SIMPLEATTRIBUTE_STUB_TRACE(X)
-#else /* (SIMPLEATTRIBUTE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEATTRIBUTE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEATTRIBUTE_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEATTRIBUTE_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h
deleted file mode 100644
index 6c1f3cf5a6f..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_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 SIMPLEATTRIBUTE_SVNT
-// ------------------------------
-#ifndef SIMPLEATTRIBUTE_SVNT_EXPORT_H
-#define SIMPLEATTRIBUTE_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEATTRIBUTE_SVNT_HAS_DLL)
-#  define SIMPLEATTRIBUTE_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEATTRIBUTE_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEATTRIBUTE_SVNT_HAS_DLL)
-#  define SIMPLEATTRIBUTE_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEATTRIBUTE_SVNT_HAS_DLL */
-
-#if defined (SIMPLEATTRIBUTE_SVNT_HAS_DLL) && (SIMPLEATTRIBUTE_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEATTRIBUTE_SVNT_BUILD_DLL)
-#    define SIMPLEATTRIBUTE_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEATTRIBUTE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEATTRIBUTE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEATTRIBUTE_SVNT_BUILD_DLL */
-#    define SIMPLEATTRIBUTE_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEATTRIBUTE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEATTRIBUTE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEATTRIBUTE_SVNT_BUILD_DLL */
-#else /* SIMPLEATTRIBUTE_SVNT_HAS_DLL == 1 */
-#  define SIMPLEATTRIBUTE_SVNT_Export
-#  define SIMPLEATTRIBUTE_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEATTRIBUTE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEATTRIBUTE_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEATTRIBUTE_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEATTRIBUTE_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEATTRIBUTE_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEATTRIBUTE_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEATTRIBUTE_SVNT_NTRACE */
-
-#if (SIMPLEATTRIBUTE_SVNT_NTRACE == 1)
-#  define SIMPLEATTRIBUTE_SVNT_TRACE(X)
-#else /* (SIMPLEATTRIBUTE_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEATTRIBUTE_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEATTRIBUTE_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEATTRIBUTE_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
index 3299b3c643c..c83d8717c69 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleCommon"
 
-project(SimpleCommon_idl_gen) : ciaoidldefaults, anytypecode {
+project(SimpleCommon_idl_gen) : componentidldefaults, anytypecode {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLECOMMON_STUB_Export \
               -Wb,stub_export_include=SimpleCommon_stub_export.h \
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h
deleted file mode 100644
index 79aac6677b7..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_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 SIMPLECOMMON_STUB
-// ------------------------------
-#ifndef SIMPLECOMMON_STUB_EXPORT_H
-#define SIMPLECOMMON_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMMON_STUB_HAS_DLL)
-#  define SIMPLECOMMON_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMMON_STUB_HAS_DLL */
-
-#if !defined (SIMPLECOMMON_STUB_HAS_DLL)
-#  define SIMPLECOMMON_STUB_HAS_DLL 1
-#endif /* ! SIMPLECOMMON_STUB_HAS_DLL */
-
-#if defined (SIMPLECOMMON_STUB_HAS_DLL) && (SIMPLECOMMON_STUB_HAS_DLL == 1)
-#  if defined (SIMPLECOMMON_STUB_BUILD_DLL)
-#    define SIMPLECOMMON_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECOMMON_STUB_BUILD_DLL */
-#    define SIMPLECOMMON_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECOMMON_STUB_BUILD_DLL */
-#else /* SIMPLECOMMON_STUB_HAS_DLL == 1 */
-#  define SIMPLECOMMON_STUB_Export
-#  define SIMPLECOMMON_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLECOMMON_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECOMMON_STUB_HAS_DLL == 1 */
-
-// Set SIMPLECOMMON_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECOMMON_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECOMMON_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECOMMON_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECOMMON_STUB_NTRACE */
-
-#if (SIMPLECOMMON_STUB_NTRACE == 1)
-#  define SIMPLECOMMON_STUB_TRACE(X)
-#else /* (SIMPLECOMMON_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECOMMON_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECOMMON_STUB_NTRACE == 1) */
-
-#endif /* SIMPLECOMMON_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h
deleted file mode 100644
index 0190bfeebab..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_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 SIMPLECOMMON_SVNT
-// ------------------------------
-#ifndef SIMPLECOMMON_SVNT_EXPORT_H
-#define SIMPLECOMMON_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECOMMON_SVNT_HAS_DLL)
-#  define SIMPLECOMMON_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECOMMON_SVNT_HAS_DLL */
-
-#if !defined (SIMPLECOMMON_SVNT_HAS_DLL)
-#  define SIMPLECOMMON_SVNT_HAS_DLL 1
-#endif /* ! SIMPLECOMMON_SVNT_HAS_DLL */
-
-#if defined (SIMPLECOMMON_SVNT_HAS_DLL) && (SIMPLECOMMON_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLECOMMON_SVNT_BUILD_DLL)
-#    define SIMPLECOMMON_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECOMMON_SVNT_BUILD_DLL */
-#    define SIMPLECOMMON_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECOMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECOMMON_SVNT_BUILD_DLL */
-#else /* SIMPLECOMMON_SVNT_HAS_DLL == 1 */
-#  define SIMPLECOMMON_SVNT_Export
-#  define SIMPLECOMMON_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLECOMMON_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECOMMON_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLECOMMON_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECOMMON_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECOMMON_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECOMMON_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECOMMON_SVNT_NTRACE */
-
-#if (SIMPLECOMMON_SVNT_NTRACE == 1)
-#  define SIMPLECOMMON_SVNT_TRACE(X)
-#else /* (SIMPLECOMMON_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECOMMON_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECOMMON_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLECOMMON_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h
deleted file mode 100644
index a8074c4c81f..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_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 SIMPLECONSUMER_EXEC
-// ------------------------------
-#ifndef SIMPLECONSUMER_EXEC_EXPORT_H
-#define SIMPLECONSUMER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECONSUMER_EXEC_HAS_DLL)
-#  define SIMPLECONSUMER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECONSUMER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLECONSUMER_EXEC_HAS_DLL)
-#  define SIMPLECONSUMER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLECONSUMER_EXEC_HAS_DLL */
-
-#if defined (SIMPLECONSUMER_EXEC_HAS_DLL) && (SIMPLECONSUMER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLECONSUMER_EXEC_BUILD_DLL)
-#    define SIMPLECONSUMER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECONSUMER_EXEC_BUILD_DLL */
-#    define SIMPLECONSUMER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECONSUMER_EXEC_BUILD_DLL */
-#else /* SIMPLECONSUMER_EXEC_HAS_DLL == 1 */
-#  define SIMPLECONSUMER_EXEC_Export
-#  define SIMPLECONSUMER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLECONSUMER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECONSUMER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLECONSUMER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECONSUMER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECONSUMER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECONSUMER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECONSUMER_EXEC_NTRACE */
-
-#if (SIMPLECONSUMER_EXEC_NTRACE == 1)
-#  define SIMPLECONSUMER_EXEC_TRACE(X)
-#else /* (SIMPLECONSUMER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECONSUMER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECONSUMER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLECONSUMER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h
deleted file mode 100644
index 89e5e37b32e..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_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 SIMPLECONSUMER_STUB
-// ------------------------------
-#ifndef SIMPLECONSUMER_STUB_EXPORT_H
-#define SIMPLECONSUMER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECONSUMER_STUB_HAS_DLL)
-#  define SIMPLECONSUMER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECONSUMER_STUB_HAS_DLL */
-
-#if !defined (SIMPLECONSUMER_STUB_HAS_DLL)
-#  define SIMPLECONSUMER_STUB_HAS_DLL 1
-#endif /* ! SIMPLECONSUMER_STUB_HAS_DLL */
-
-#if defined (SIMPLECONSUMER_STUB_HAS_DLL) && (SIMPLECONSUMER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLECONSUMER_STUB_BUILD_DLL)
-#    define SIMPLECONSUMER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECONSUMER_STUB_BUILD_DLL */
-#    define SIMPLECONSUMER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECONSUMER_STUB_BUILD_DLL */
-#else /* SIMPLECONSUMER_STUB_HAS_DLL == 1 */
-#  define SIMPLECONSUMER_STUB_Export
-#  define SIMPLECONSUMER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLECONSUMER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECONSUMER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLECONSUMER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECONSUMER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECONSUMER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECONSUMER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECONSUMER_STUB_NTRACE */
-
-#if (SIMPLECONSUMER_STUB_NTRACE == 1)
-#  define SIMPLECONSUMER_STUB_TRACE(X)
-#else /* (SIMPLECONSUMER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECONSUMER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECONSUMER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLECONSUMER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h
deleted file mode 100644
index eab50bcfd0a..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_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 SIMPLECONSUMER_SVNT
-// ------------------------------
-#ifndef SIMPLECONSUMER_SVNT_EXPORT_H
-#define SIMPLECONSUMER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLECONSUMER_SVNT_HAS_DLL)
-#  define SIMPLECONSUMER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLECONSUMER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLECONSUMER_SVNT_HAS_DLL)
-#  define SIMPLECONSUMER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLECONSUMER_SVNT_HAS_DLL */
-
-#if defined (SIMPLECONSUMER_SVNT_HAS_DLL) && (SIMPLECONSUMER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLECONSUMER_SVNT_BUILD_DLL)
-#    define SIMPLECONSUMER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLECONSUMER_SVNT_BUILD_DLL */
-#    define SIMPLECONSUMER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLECONSUMER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLECONSUMER_SVNT_BUILD_DLL */
-#else /* SIMPLECONSUMER_SVNT_HAS_DLL == 1 */
-#  define SIMPLECONSUMER_SVNT_Export
-#  define SIMPLECONSUMER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLECONSUMER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLECONSUMER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLECONSUMER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLECONSUMER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLECONSUMER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLECONSUMER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLECONSUMER_SVNT_NTRACE */
-
-#if (SIMPLECONSUMER_SVNT_NTRACE == 1)
-#  define SIMPLECONSUMER_SVNT_TRACE(X)
-#else /* (SIMPLECONSUMER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLECONSUMER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLECONSUMER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLECONSUMER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h
deleted file mode 100644
index 53fef48b799..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_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 SIMPLEEMITTER_EXEC
-// ------------------------------
-#ifndef SIMPLEEMITTER_EXEC_EXPORT_H
-#define SIMPLEEMITTER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEEMITTER_EXEC_HAS_DLL)
-#  define SIMPLEEMITTER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEEMITTER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEEMITTER_EXEC_HAS_DLL)
-#  define SIMPLEEMITTER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEEMITTER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEEMITTER_EXEC_HAS_DLL) && (SIMPLEEMITTER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEEMITTER_EXEC_BUILD_DLL)
-#    define SIMPLEEMITTER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEEMITTER_EXEC_BUILD_DLL */
-#    define SIMPLEEMITTER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEEMITTER_EXEC_BUILD_DLL */
-#else /* SIMPLEEMITTER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEEMITTER_EXEC_Export
-#  define SIMPLEEMITTER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEEMITTER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEEMITTER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEEMITTER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEEMITTER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEEMITTER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEEMITTER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEEMITTER_EXEC_NTRACE */
-
-#if (SIMPLEEMITTER_EXEC_NTRACE == 1)
-#  define SIMPLEEMITTER_EXEC_TRACE(X)
-#else /* (SIMPLEEMITTER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEEMITTER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEEMITTER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEEMITTER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h
deleted file mode 100644
index 797140271a4..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_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 SIMPLEEMITTER_STUB
-// ------------------------------
-#ifndef SIMPLEEMITTER_STUB_EXPORT_H
-#define SIMPLEEMITTER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEEMITTER_STUB_HAS_DLL)
-#  define SIMPLEEMITTER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEEMITTER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEEMITTER_STUB_HAS_DLL)
-#  define SIMPLEEMITTER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEEMITTER_STUB_HAS_DLL */
-
-#if defined (SIMPLEEMITTER_STUB_HAS_DLL) && (SIMPLEEMITTER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEEMITTER_STUB_BUILD_DLL)
-#    define SIMPLEEMITTER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEEMITTER_STUB_BUILD_DLL */
-#    define SIMPLEEMITTER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEEMITTER_STUB_BUILD_DLL */
-#else /* SIMPLEEMITTER_STUB_HAS_DLL == 1 */
-#  define SIMPLEEMITTER_STUB_Export
-#  define SIMPLEEMITTER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEEMITTER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEEMITTER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEEMITTER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEEMITTER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEEMITTER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEEMITTER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEEMITTER_STUB_NTRACE */
-
-#if (SIMPLEEMITTER_STUB_NTRACE == 1)
-#  define SIMPLEEMITTER_STUB_TRACE(X)
-#else /* (SIMPLEEMITTER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEEMITTER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEEMITTER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEEMITTER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h
deleted file mode 100644
index 0fdc781a895..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_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 SIMPLEEMITTER_SVNT
-// ------------------------------
-#ifndef SIMPLEEMITTER_SVNT_EXPORT_H
-#define SIMPLEEMITTER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEEMITTER_SVNT_HAS_DLL)
-#  define SIMPLEEMITTER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEEMITTER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEEMITTER_SVNT_HAS_DLL)
-#  define SIMPLEEMITTER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEEMITTER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEEMITTER_SVNT_HAS_DLL) && (SIMPLEEMITTER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEEMITTER_SVNT_BUILD_DLL)
-#    define SIMPLEEMITTER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEEMITTER_SVNT_BUILD_DLL */
-#    define SIMPLEEMITTER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEEMITTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEEMITTER_SVNT_BUILD_DLL */
-#else /* SIMPLEEMITTER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEEMITTER_SVNT_Export
-#  define SIMPLEEMITTER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEEMITTER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEEMITTER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEEMITTER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEEMITTER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEEMITTER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEEMITTER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEEMITTER_SVNT_NTRACE */
-
-#if (SIMPLEEMITTER_SVNT_NTRACE == 1)
-#  define SIMPLEEMITTER_SVNT_TRACE(X)
-#else /* (SIMPLEEMITTER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEEMITTER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEEMITTER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEEMITTER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h
deleted file mode 100644
index 79cec9f8fe7..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_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 SIMPLEMULTIPLEUSER_EXEC
-// ------------------------------
-#ifndef SIMPLEMULTIPLEUSER_EXEC_EXPORT_H
-#define SIMPLEMULTIPLEUSER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEMULTIPLEUSER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEMULTIPLEUSER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL) && (SIMPLEMULTIPLEUSER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL)
-#    define SIMPLEMULTIPLEUSER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL */
-#    define SIMPLEMULTIPLEUSER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEMULTIPLEUSER_EXEC_BUILD_DLL */
-#else /* SIMPLEMULTIPLEUSER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEMULTIPLEUSER_EXEC_Export
-#  define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEMULTIPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEMULTIPLEUSER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEMULTIPLEUSER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEMULTIPLEUSER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEMULTIPLEUSER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEMULTIPLEUSER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEMULTIPLEUSER_EXEC_NTRACE */
-
-#if (SIMPLEMULTIPLEUSER_EXEC_NTRACE == 1)
-#  define SIMPLEMULTIPLEUSER_EXEC_TRACE(X)
-#else /* (SIMPLEMULTIPLEUSER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEMULTIPLEUSER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEMULTIPLEUSER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEMULTIPLEUSER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h
deleted file mode 100644
index bf0be40ece3..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_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 SIMPLEMULTIPLEUSER_STUB
-// ------------------------------
-#ifndef SIMPLEMULTIPLEUSER_STUB_EXPORT_H
-#define SIMPLEMULTIPLEUSER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEMULTIPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEMULTIPLEUSER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEMULTIPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEMULTIPLEUSER_STUB_HAS_DLL */
-
-#if defined (SIMPLEMULTIPLEUSER_STUB_HAS_DLL) && (SIMPLEMULTIPLEUSER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEMULTIPLEUSER_STUB_BUILD_DLL)
-#    define SIMPLEMULTIPLEUSER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEMULTIPLEUSER_STUB_BUILD_DLL */
-#    define SIMPLEMULTIPLEUSER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEMULTIPLEUSER_STUB_BUILD_DLL */
-#else /* SIMPLEMULTIPLEUSER_STUB_HAS_DLL == 1 */
-#  define SIMPLEMULTIPLEUSER_STUB_Export
-#  define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEMULTIPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEMULTIPLEUSER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEMULTIPLEUSER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEMULTIPLEUSER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEMULTIPLEUSER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEMULTIPLEUSER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEMULTIPLEUSER_STUB_NTRACE */
-
-#if (SIMPLEMULTIPLEUSER_STUB_NTRACE == 1)
-#  define SIMPLEMULTIPLEUSER_STUB_TRACE(X)
-#else /* (SIMPLEMULTIPLEUSER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEMULTIPLEUSER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEMULTIPLEUSER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEMULTIPLEUSER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h
deleted file mode 100644
index 97f0fdf0f00..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_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 SIMPLEMULTIPLEUSER_SVNT
-// ------------------------------
-#ifndef SIMPLEMULTIPLEUSER_SVNT_EXPORT_H
-#define SIMPLEMULTIPLEUSER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEMULTIPLEUSER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEMULTIPLEUSER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEMULTIPLEUSER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL) && (SIMPLEMULTIPLEUSER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL)
-#    define SIMPLEMULTIPLEUSER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL */
-#    define SIMPLEMULTIPLEUSER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL */
-#else /* SIMPLEMULTIPLEUSER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEMULTIPLEUSER_SVNT_Export
-#  define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEMULTIPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEMULTIPLEUSER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEMULTIPLEUSER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEMULTIPLEUSER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEMULTIPLEUSER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEMULTIPLEUSER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEMULTIPLEUSER_SVNT_NTRACE */
-
-#if (SIMPLEMULTIPLEUSER_SVNT_NTRACE == 1)
-#  define SIMPLEMULTIPLEUSER_SVNT_TRACE(X)
-#else /* (SIMPLEMULTIPLEUSER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEMULTIPLEUSER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEMULTIPLEUSER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEMULTIPLEUSER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h
deleted file mode 100644
index 5d0ff473419..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_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 SIMPLENULL_EXEC
-// ------------------------------
-#ifndef SIMPLENULL_EXEC_EXPORT_H
-#define SIMPLENULL_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLENULL_EXEC_HAS_DLL)
-#  define SIMPLENULL_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLENULL_EXEC_HAS_DLL */
-
-#if !defined (SIMPLENULL_EXEC_HAS_DLL)
-#  define SIMPLENULL_EXEC_HAS_DLL 1
-#endif /* ! SIMPLENULL_EXEC_HAS_DLL */
-
-#if defined (SIMPLENULL_EXEC_HAS_DLL) && (SIMPLENULL_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLENULL_EXEC_BUILD_DLL)
-#    define SIMPLENULL_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLENULL_EXEC_BUILD_DLL */
-#    define SIMPLENULL_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLENULL_EXEC_BUILD_DLL */
-#else /* SIMPLENULL_EXEC_HAS_DLL == 1 */
-#  define SIMPLENULL_EXEC_Export
-#  define SIMPLENULL_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLENULL_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLENULL_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLENULL_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLENULL_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLENULL_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLENULL_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLENULL_EXEC_NTRACE */
-
-#if (SIMPLENULL_EXEC_NTRACE == 1)
-#  define SIMPLENULL_EXEC_TRACE(X)
-#else /* (SIMPLENULL_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLENULL_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLENULL_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLENULL_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h
deleted file mode 100644
index 17eef930019..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_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 SIMPLENULL_STUB
-// ------------------------------
-#ifndef SIMPLENULL_STUB_EXPORT_H
-#define SIMPLENULL_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLENULL_STUB_HAS_DLL)
-#  define SIMPLENULL_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLENULL_STUB_HAS_DLL */
-
-#if !defined (SIMPLENULL_STUB_HAS_DLL)
-#  define SIMPLENULL_STUB_HAS_DLL 1
-#endif /* ! SIMPLENULL_STUB_HAS_DLL */
-
-#if defined (SIMPLENULL_STUB_HAS_DLL) && (SIMPLENULL_STUB_HAS_DLL == 1)
-#  if defined (SIMPLENULL_STUB_BUILD_DLL)
-#    define SIMPLENULL_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLENULL_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLENULL_STUB_BUILD_DLL */
-#    define SIMPLENULL_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLENULL_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLENULL_STUB_BUILD_DLL */
-#else /* SIMPLENULL_STUB_HAS_DLL == 1 */
-#  define SIMPLENULL_STUB_Export
-#  define SIMPLENULL_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLENULL_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLENULL_STUB_HAS_DLL == 1 */
-
-// Set SIMPLENULL_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLENULL_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLENULL_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLENULL_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLENULL_STUB_NTRACE */
-
-#if (SIMPLENULL_STUB_NTRACE == 1)
-#  define SIMPLENULL_STUB_TRACE(X)
-#else /* (SIMPLENULL_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLENULL_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLENULL_STUB_NTRACE == 1) */
-
-#endif /* SIMPLENULL_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h
deleted file mode 100644
index 9afa614f9a4..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_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 SIMPLENULL_SVNT
-// ------------------------------
-#ifndef SIMPLENULL_SVNT_EXPORT_H
-#define SIMPLENULL_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLENULL_SVNT_HAS_DLL)
-#  define SIMPLENULL_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLENULL_SVNT_HAS_DLL */
-
-#if !defined (SIMPLENULL_SVNT_HAS_DLL)
-#  define SIMPLENULL_SVNT_HAS_DLL 1
-#endif /* ! SIMPLENULL_SVNT_HAS_DLL */
-
-#if defined (SIMPLENULL_SVNT_HAS_DLL) && (SIMPLENULL_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLENULL_SVNT_BUILD_DLL)
-#    define SIMPLENULL_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLENULL_SVNT_BUILD_DLL */
-#    define SIMPLENULL_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLENULL_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLENULL_SVNT_BUILD_DLL */
-#else /* SIMPLENULL_SVNT_HAS_DLL == 1 */
-#  define SIMPLENULL_SVNT_Export
-#  define SIMPLENULL_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLENULL_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLENULL_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLENULL_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLENULL_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLENULL_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLENULL_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLENULL_SVNT_NTRACE */
-
-#if (SIMPLENULL_SVNT_NTRACE == 1)
-#  define SIMPLENULL_SVNT_TRACE(X)
-#else /* (SIMPLENULL_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLENULL_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLENULL_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLENULL_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
index 2fe1d5541b6..d040f1c4e74 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
@@ -3,7 +3,8 @@
 
 project(SimpleCommon_SimpleProvider_idl_gen) : componentidldefaults {
   custom_only = 1
-  idlflags += -Wb,stub_export_macro=SIMPLEPROVIDER_STUB_Export \
+  idlflags += -Glfa \
+              -Wb,stub_export_macro=SIMPLEPROVIDER_STUB_Export \
               -Wb,stub_export_include=SimpleProvider_stub_export.h \
               -Wb,skel_export_macro=SIMPLEPROVIDER_SVNT_Export \
               -Wb,skel_export_include=SimpleProvider_svnt_export.h \
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h
deleted file mode 100644
index c5e9182f61f..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_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 SIMPLEPROVIDER_EXEC
-// ------------------------------
-#ifndef SIMPLEPROVIDER_EXEC_EXPORT_H
-#define SIMPLEPROVIDER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPROVIDER_EXEC_HAS_DLL)
-#  define SIMPLEPROVIDER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPROVIDER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEPROVIDER_EXEC_HAS_DLL)
-#  define SIMPLEPROVIDER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEPROVIDER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEPROVIDER_EXEC_HAS_DLL) && (SIMPLEPROVIDER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEPROVIDER_EXEC_BUILD_DLL)
-#    define SIMPLEPROVIDER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPROVIDER_EXEC_BUILD_DLL */
-#    define SIMPLEPROVIDER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPROVIDER_EXEC_BUILD_DLL */
-#else /* SIMPLEPROVIDER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEPROVIDER_EXEC_Export
-#  define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEPROVIDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPROVIDER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEPROVIDER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPROVIDER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPROVIDER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPROVIDER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPROVIDER_EXEC_NTRACE */
-
-#if (SIMPLEPROVIDER_EXEC_NTRACE == 1)
-#  define SIMPLEPROVIDER_EXEC_TRACE(X)
-#else /* (SIMPLEPROVIDER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPROVIDER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPROVIDER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEPROVIDER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h
deleted file mode 100644
index 795f3fec902..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_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 SIMPLEPROVIDER_STUB
-// ------------------------------
-#ifndef SIMPLEPROVIDER_STUB_EXPORT_H
-#define SIMPLEPROVIDER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPROVIDER_STUB_HAS_DLL)
-#  define SIMPLEPROVIDER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPROVIDER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEPROVIDER_STUB_HAS_DLL)
-#  define SIMPLEPROVIDER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEPROVIDER_STUB_HAS_DLL */
-
-#if defined (SIMPLEPROVIDER_STUB_HAS_DLL) && (SIMPLEPROVIDER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEPROVIDER_STUB_BUILD_DLL)
-#    define SIMPLEPROVIDER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPROVIDER_STUB_BUILD_DLL */
-#    define SIMPLEPROVIDER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPROVIDER_STUB_BUILD_DLL */
-#else /* SIMPLEPROVIDER_STUB_HAS_DLL == 1 */
-#  define SIMPLEPROVIDER_STUB_Export
-#  define SIMPLEPROVIDER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEPROVIDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPROVIDER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEPROVIDER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPROVIDER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPROVIDER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPROVIDER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPROVIDER_STUB_NTRACE */
-
-#if (SIMPLEPROVIDER_STUB_NTRACE == 1)
-#  define SIMPLEPROVIDER_STUB_TRACE(X)
-#else /* (SIMPLEPROVIDER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPROVIDER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPROVIDER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEPROVIDER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h
deleted file mode 100644
index 5f6be2501b6..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_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 SIMPLEPROVIDER_SVNT
-// ------------------------------
-#ifndef SIMPLEPROVIDER_SVNT_EXPORT_H
-#define SIMPLEPROVIDER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPROVIDER_SVNT_HAS_DLL)
-#  define SIMPLEPROVIDER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPROVIDER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEPROVIDER_SVNT_HAS_DLL)
-#  define SIMPLEPROVIDER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEPROVIDER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEPROVIDER_SVNT_HAS_DLL) && (SIMPLEPROVIDER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEPROVIDER_SVNT_BUILD_DLL)
-#    define SIMPLEPROVIDER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPROVIDER_SVNT_BUILD_DLL */
-#    define SIMPLEPROVIDER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPROVIDER_SVNT_BUILD_DLL */
-#else /* SIMPLEPROVIDER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEPROVIDER_SVNT_Export
-#  define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEPROVIDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPROVIDER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEPROVIDER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPROVIDER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPROVIDER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPROVIDER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPROVIDER_SVNT_NTRACE */
-
-#if (SIMPLEPROVIDER_SVNT_NTRACE == 1)
-#  define SIMPLEPROVIDER_SVNT_TRACE(X)
-#else /* (SIMPLEPROVIDER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPROVIDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPROVIDER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEPROVIDER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h
deleted file mode 100644
index 2f18677399f..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_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 SIMPLEPUBLISHER_EXEC
-// ------------------------------
-#ifndef SIMPLEPUBLISHER_EXEC_EXPORT_H
-#define SIMPLEPUBLISHER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPUBLISHER_EXEC_HAS_DLL)
-#  define SIMPLEPUBLISHER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPUBLISHER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEPUBLISHER_EXEC_HAS_DLL)
-#  define SIMPLEPUBLISHER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEPUBLISHER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEPUBLISHER_EXEC_HAS_DLL) && (SIMPLEPUBLISHER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEPUBLISHER_EXEC_BUILD_DLL)
-#    define SIMPLEPUBLISHER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPUBLISHER_EXEC_BUILD_DLL */
-#    define SIMPLEPUBLISHER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPUBLISHER_EXEC_BUILD_DLL */
-#else /* SIMPLEPUBLISHER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEPUBLISHER_EXEC_Export
-#  define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEPUBLISHER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPUBLISHER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEPUBLISHER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPUBLISHER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPUBLISHER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPUBLISHER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPUBLISHER_EXEC_NTRACE */
-
-#if (SIMPLEPUBLISHER_EXEC_NTRACE == 1)
-#  define SIMPLEPUBLISHER_EXEC_TRACE(X)
-#else /* (SIMPLEPUBLISHER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPUBLISHER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPUBLISHER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEPUBLISHER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h
deleted file mode 100644
index 8ab3300c5ca..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_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 SIMPLEPUBLISHER_STUB
-// ------------------------------
-#ifndef SIMPLEPUBLISHER_STUB_EXPORT_H
-#define SIMPLEPUBLISHER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPUBLISHER_STUB_HAS_DLL)
-#  define SIMPLEPUBLISHER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPUBLISHER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEPUBLISHER_STUB_HAS_DLL)
-#  define SIMPLEPUBLISHER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEPUBLISHER_STUB_HAS_DLL */
-
-#if defined (SIMPLEPUBLISHER_STUB_HAS_DLL) && (SIMPLEPUBLISHER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEPUBLISHER_STUB_BUILD_DLL)
-#    define SIMPLEPUBLISHER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPUBLISHER_STUB_BUILD_DLL */
-#    define SIMPLEPUBLISHER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPUBLISHER_STUB_BUILD_DLL */
-#else /* SIMPLEPUBLISHER_STUB_HAS_DLL == 1 */
-#  define SIMPLEPUBLISHER_STUB_Export
-#  define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEPUBLISHER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPUBLISHER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEPUBLISHER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPUBLISHER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPUBLISHER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPUBLISHER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPUBLISHER_STUB_NTRACE */
-
-#if (SIMPLEPUBLISHER_STUB_NTRACE == 1)
-#  define SIMPLEPUBLISHER_STUB_TRACE(X)
-#else /* (SIMPLEPUBLISHER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPUBLISHER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPUBLISHER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEPUBLISHER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h
deleted file mode 100644
index cbc5f4e56be..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_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 SIMPLEPUBLISHER_SVNT
-// ------------------------------
-#ifndef SIMPLEPUBLISHER_SVNT_EXPORT_H
-#define SIMPLEPUBLISHER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEPUBLISHER_SVNT_HAS_DLL)
-#  define SIMPLEPUBLISHER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEPUBLISHER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEPUBLISHER_SVNT_HAS_DLL)
-#  define SIMPLEPUBLISHER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEPUBLISHER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEPUBLISHER_SVNT_HAS_DLL) && (SIMPLEPUBLISHER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEPUBLISHER_SVNT_BUILD_DLL)
-#    define SIMPLEPUBLISHER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEPUBLISHER_SVNT_BUILD_DLL */
-#    define SIMPLEPUBLISHER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEPUBLISHER_SVNT_BUILD_DLL */
-#else /* SIMPLEPUBLISHER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEPUBLISHER_SVNT_Export
-#  define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEPUBLISHER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEPUBLISHER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEPUBLISHER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEPUBLISHER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEPUBLISHER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEPUBLISHER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEPUBLISHER_SVNT_NTRACE */
-
-#if (SIMPLEPUBLISHER_SVNT_NTRACE == 1)
-#  define SIMPLEPUBLISHER_SVNT_TRACE(X)
-#else /* (SIMPLEPUBLISHER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEPUBLISHER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEPUBLISHER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEPUBLISHER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h
deleted file mode 100644
index fcc935919a3..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_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 SIMPLEUSER_EXEC
-// ------------------------------
-#ifndef SIMPLEUSER_EXEC_EXPORT_H
-#define SIMPLEUSER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEUSER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEUSER_EXEC_HAS_DLL */
-
-#if !defined (SIMPLEUSER_EXEC_HAS_DLL)
-#  define SIMPLEUSER_EXEC_HAS_DLL 1
-#endif /* ! SIMPLEUSER_EXEC_HAS_DLL */
-
-#if defined (SIMPLEUSER_EXEC_HAS_DLL) && (SIMPLEUSER_EXEC_HAS_DLL == 1)
-#  if defined (SIMPLEUSER_EXEC_BUILD_DLL)
-#    define SIMPLEUSER_EXEC_Export ACE_Proper_Export_Flag
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEUSER_EXEC_BUILD_DLL */
-#    define SIMPLEUSER_EXEC_Export ACE_Proper_Import_Flag
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEUSER_EXEC_BUILD_DLL */
-#else /* SIMPLEUSER_EXEC_HAS_DLL == 1 */
-#  define SIMPLEUSER_EXEC_Export
-#  define SIMPLEUSER_EXEC_SINGLETON_DECLARATION(T)
-#  define SIMPLEUSER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEUSER_EXEC_HAS_DLL == 1 */
-
-// Set SIMPLEUSER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEUSER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEUSER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEUSER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEUSER_EXEC_NTRACE */
-
-#if (SIMPLEUSER_EXEC_NTRACE == 1)
-#  define SIMPLEUSER_EXEC_TRACE(X)
-#else /* (SIMPLEUSER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEUSER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEUSER_EXEC_NTRACE == 1) */
-
-#endif /* SIMPLEUSER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h
deleted file mode 100644
index a31d19d5614..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_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 SIMPLEUSER_STUB
-// ------------------------------
-#ifndef SIMPLEUSER_STUB_EXPORT_H
-#define SIMPLEUSER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEUSER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEUSER_STUB_HAS_DLL */
-
-#if !defined (SIMPLEUSER_STUB_HAS_DLL)
-#  define SIMPLEUSER_STUB_HAS_DLL 1
-#endif /* ! SIMPLEUSER_STUB_HAS_DLL */
-
-#if defined (SIMPLEUSER_STUB_HAS_DLL) && (SIMPLEUSER_STUB_HAS_DLL == 1)
-#  if defined (SIMPLEUSER_STUB_BUILD_DLL)
-#    define SIMPLEUSER_STUB_Export ACE_Proper_Export_Flag
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEUSER_STUB_BUILD_DLL */
-#    define SIMPLEUSER_STUB_Export ACE_Proper_Import_Flag
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEUSER_STUB_BUILD_DLL */
-#else /* SIMPLEUSER_STUB_HAS_DLL == 1 */
-#  define SIMPLEUSER_STUB_Export
-#  define SIMPLEUSER_STUB_SINGLETON_DECLARATION(T)
-#  define SIMPLEUSER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEUSER_STUB_HAS_DLL == 1 */
-
-// Set SIMPLEUSER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEUSER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEUSER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEUSER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEUSER_STUB_NTRACE */
-
-#if (SIMPLEUSER_STUB_NTRACE == 1)
-#  define SIMPLEUSER_STUB_TRACE(X)
-#else /* (SIMPLEUSER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEUSER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEUSER_STUB_NTRACE == 1) */
-
-#endif /* SIMPLEUSER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h
deleted file mode 100644
index 897f82c3081..00000000000
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_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 SIMPLEUSER_SVNT
-// ------------------------------
-#ifndef SIMPLEUSER_SVNT_EXPORT_H
-#define SIMPLEUSER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (SIMPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEUSER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && SIMPLEUSER_SVNT_HAS_DLL */
-
-#if !defined (SIMPLEUSER_SVNT_HAS_DLL)
-#  define SIMPLEUSER_SVNT_HAS_DLL 1
-#endif /* ! SIMPLEUSER_SVNT_HAS_DLL */
-
-#if defined (SIMPLEUSER_SVNT_HAS_DLL) && (SIMPLEUSER_SVNT_HAS_DLL == 1)
-#  if defined (SIMPLEUSER_SVNT_BUILD_DLL)
-#    define SIMPLEUSER_SVNT_Export ACE_Proper_Export_Flag
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* SIMPLEUSER_SVNT_BUILD_DLL */
-#    define SIMPLEUSER_SVNT_Export ACE_Proper_Import_Flag
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define SIMPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* SIMPLEUSER_SVNT_BUILD_DLL */
-#else /* SIMPLEUSER_SVNT_HAS_DLL == 1 */
-#  define SIMPLEUSER_SVNT_Export
-#  define SIMPLEUSER_SVNT_SINGLETON_DECLARATION(T)
-#  define SIMPLEUSER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* SIMPLEUSER_SVNT_HAS_DLL == 1 */
-
-// Set SIMPLEUSER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (SIMPLEUSER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define SIMPLEUSER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define SIMPLEUSER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !SIMPLEUSER_SVNT_NTRACE */
-
-#if (SIMPLEUSER_SVNT_NTRACE == 1)
-#  define SIMPLEUSER_SVNT_TRACE(X)
-#else /* (SIMPLEUSER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define SIMPLEUSER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (SIMPLEUSER_SVNT_NTRACE == 1) */
-
-#endif /* SIMPLEUSER_SVNT_EXPORT_H */
-
-// End of auto generated file.