ChangeLogTag: Tue Sep 22 21:45:42 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

11 files changed, 21 insertions, 466 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 4ab6a58838d..e3bf0650dac 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Tue Sep 22 21:45:42 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h:
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h:
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h:
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h:
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h:
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h:
+        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h:
+        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h:
+
+          Removed these files, now generated.
+
+        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc:
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc:
+
+          Config updates.
+
 Tue Sep 22 21:22:48 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * performance-tests/Protocols/Sender/Sender_svnt_export.h:
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec_export.h
deleted file mode 100644
index f44954cb39a..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_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 STOCKBROKER_EXEC
-// ------------------------------
-#ifndef STOCKBROKER_EXEC_EXPORT_H
-#define STOCKBROKER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCKBROKER_EXEC_HAS_DLL)
-#  define STOCKBROKER_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCKBROKER_EXEC_HAS_DLL */
-
-#if !defined (STOCKBROKER_EXEC_HAS_DLL)
-#  define STOCKBROKER_EXEC_HAS_DLL 1
-#endif /* ! STOCKBROKER_EXEC_HAS_DLL */
-
-#if defined (STOCKBROKER_EXEC_HAS_DLL) && (STOCKBROKER_EXEC_HAS_DLL == 1)
-#  if defined (STOCKBROKER_EXEC_BUILD_DLL)
-#    define STOCKBROKER_EXEC_Export ACE_Proper_Export_Flag
-#    define STOCKBROKER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCKBROKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCKBROKER_EXEC_BUILD_DLL */
-#    define STOCKBROKER_EXEC_Export ACE_Proper_Import_Flag
-#    define STOCKBROKER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCKBROKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCKBROKER_EXEC_BUILD_DLL */
-#else /* STOCKBROKER_EXEC_HAS_DLL == 1 */
-#  define STOCKBROKER_EXEC_Export
-#  define STOCKBROKER_EXEC_SINGLETON_DECLARATION(T)
-#  define STOCKBROKER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCKBROKER_EXEC_HAS_DLL == 1 */
-
-// Set STOCKBROKER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCKBROKER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCKBROKER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCKBROKER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCKBROKER_EXEC_NTRACE */
-
-#if (STOCKBROKER_EXEC_NTRACE == 1)
-#  define STOCKBROKER_EXEC_TRACE(X)
-#else /* (STOCKBROKER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCKBROKER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCKBROKER_EXEC_NTRACE == 1) */
-
-#endif /* STOCKBROKER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_stub_export.h
deleted file mode 100644
index 45db14323e7..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_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 STOCKBROKER_STUB
-// ------------------------------
-#ifndef STOCKBROKER_STUB_EXPORT_H
-#define STOCKBROKER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCKBROKER_STUB_HAS_DLL)
-#  define STOCKBROKER_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCKBROKER_STUB_HAS_DLL */
-
-#if !defined (STOCKBROKER_STUB_HAS_DLL)
-#  define STOCKBROKER_STUB_HAS_DLL 1
-#endif /* ! STOCKBROKER_STUB_HAS_DLL */
-
-#if defined (STOCKBROKER_STUB_HAS_DLL) && (STOCKBROKER_STUB_HAS_DLL == 1)
-#  if defined (STOCKBROKER_STUB_BUILD_DLL)
-#    define STOCKBROKER_STUB_Export ACE_Proper_Export_Flag
-#    define STOCKBROKER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCKBROKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCKBROKER_STUB_BUILD_DLL */
-#    define STOCKBROKER_STUB_Export ACE_Proper_Import_Flag
-#    define STOCKBROKER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCKBROKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCKBROKER_STUB_BUILD_DLL */
-#else /* STOCKBROKER_STUB_HAS_DLL == 1 */
-#  define STOCKBROKER_STUB_Export
-#  define STOCKBROKER_STUB_SINGLETON_DECLARATION(T)
-#  define STOCKBROKER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCKBROKER_STUB_HAS_DLL == 1 */
-
-// Set STOCKBROKER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCKBROKER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCKBROKER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCKBROKER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCKBROKER_STUB_NTRACE */
-
-#if (STOCKBROKER_STUB_NTRACE == 1)
-#  define STOCKBROKER_STUB_TRACE(X)
-#else /* (STOCKBROKER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCKBROKER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCKBROKER_STUB_NTRACE == 1) */
-
-#endif /* STOCKBROKER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_svnt_export.h
deleted file mode 100644
index 37a8db48e21..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_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 STOCKBROKER_SVNT
-// ------------------------------
-#ifndef STOCKBROKER_SVNT_EXPORT_H
-#define STOCKBROKER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCKBROKER_SVNT_HAS_DLL)
-#  define STOCKBROKER_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCKBROKER_SVNT_HAS_DLL */
-
-#if !defined (STOCKBROKER_SVNT_HAS_DLL)
-#  define STOCKBROKER_SVNT_HAS_DLL 1
-#endif /* ! STOCKBROKER_SVNT_HAS_DLL */
-
-#if defined (STOCKBROKER_SVNT_HAS_DLL) && (STOCKBROKER_SVNT_HAS_DLL == 1)
-#  if defined (STOCKBROKER_SVNT_BUILD_DLL)
-#    define STOCKBROKER_SVNT_Export ACE_Proper_Export_Flag
-#    define STOCKBROKER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCKBROKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCKBROKER_SVNT_BUILD_DLL */
-#    define STOCKBROKER_SVNT_Export ACE_Proper_Import_Flag
-#    define STOCKBROKER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCKBROKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCKBROKER_SVNT_BUILD_DLL */
-#else /* STOCKBROKER_SVNT_HAS_DLL == 1 */
-#  define STOCKBROKER_SVNT_Export
-#  define STOCKBROKER_SVNT_SINGLETON_DECLARATION(T)
-#  define STOCKBROKER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCKBROKER_SVNT_HAS_DLL == 1 */
-
-// Set STOCKBROKER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCKBROKER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCKBROKER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCKBROKER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCKBROKER_SVNT_NTRACE */
-
-#if (STOCKBROKER_SVNT_NTRACE == 1)
-#  define STOCKBROKER_SVNT_TRACE(X)
-#else /* (STOCKBROKER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCKBROKER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCKBROKER_SVNT_NTRACE == 1) */
-
-#endif /* STOCKBROKER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
index 6ae35b50ff0..9a4fda04ba4 100644
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+++ b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
@@ -3,7 +3,8 @@
 
 project(Stock_Base_StockDistributor_idl_gen) : componentidldefaults {
   custom_only = 1
-  idlflags += -Wb,stub_export_macro=STOCKDISTRIBUTOR_STUB_Export \
+  idlflags += -Glfa \
+              -Wb,stub_export_macro=STOCKDISTRIBUTOR_STUB_Export \
               -Wb,stub_export_include=StockDistributor_stub_export.h \
               -Wb,skel_export_macro=STOCKDISTRIBUTOR_SVNT_Export \
               -Wb,skel_export_include=StockDistributor_svnt_export.h \
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec_export.h
deleted file mode 100644
index c66d6a1b23f..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_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 STOCKDISTRIBUTOR_EXEC
-// ------------------------------
-#ifndef STOCKDISTRIBUTOR_EXEC_EXPORT_H
-#define STOCKDISTRIBUTOR_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCKDISTRIBUTOR_EXEC_HAS_DLL)
-#  define STOCKDISTRIBUTOR_EXEC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCKDISTRIBUTOR_EXEC_HAS_DLL */
-
-#if !defined (STOCKDISTRIBUTOR_EXEC_HAS_DLL)
-#  define STOCKDISTRIBUTOR_EXEC_HAS_DLL 1
-#endif /* ! STOCKDISTRIBUTOR_EXEC_HAS_DLL */
-
-#if defined (STOCKDISTRIBUTOR_EXEC_HAS_DLL) && (STOCKDISTRIBUTOR_EXEC_HAS_DLL == 1)
-#  if defined (STOCKDISTRIBUTOR_EXEC_BUILD_DLL)
-#    define STOCKDISTRIBUTOR_EXEC_Export ACE_Proper_Export_Flag
-#    define STOCKDISTRIBUTOR_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCKDISTRIBUTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCKDISTRIBUTOR_EXEC_BUILD_DLL */
-#    define STOCKDISTRIBUTOR_EXEC_Export ACE_Proper_Import_Flag
-#    define STOCKDISTRIBUTOR_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCKDISTRIBUTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCKDISTRIBUTOR_EXEC_BUILD_DLL */
-#else /* STOCKDISTRIBUTOR_EXEC_HAS_DLL == 1 */
-#  define STOCKDISTRIBUTOR_EXEC_Export
-#  define STOCKDISTRIBUTOR_EXEC_SINGLETON_DECLARATION(T)
-#  define STOCKDISTRIBUTOR_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCKDISTRIBUTOR_EXEC_HAS_DLL == 1 */
-
-// Set STOCKDISTRIBUTOR_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCKDISTRIBUTOR_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCKDISTRIBUTOR_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCKDISTRIBUTOR_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCKDISTRIBUTOR_EXEC_NTRACE */
-
-#if (STOCKDISTRIBUTOR_EXEC_NTRACE == 1)
-#  define STOCKDISTRIBUTOR_EXEC_TRACE(X)
-#else /* (STOCKDISTRIBUTOR_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCKDISTRIBUTOR_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCKDISTRIBUTOR_EXEC_NTRACE == 1) */
-
-#endif /* STOCKDISTRIBUTOR_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_stub_export.h
deleted file mode 100644
index efb7539a84c..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_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 STOCKDISTRIBUTOR_STUB
-// ------------------------------
-#ifndef STOCKDISTRIBUTOR_STUB_EXPORT_H
-#define STOCKDISTRIBUTOR_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCKDISTRIBUTOR_STUB_HAS_DLL)
-#  define STOCKDISTRIBUTOR_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCKDISTRIBUTOR_STUB_HAS_DLL */
-
-#if !defined (STOCKDISTRIBUTOR_STUB_HAS_DLL)
-#  define STOCKDISTRIBUTOR_STUB_HAS_DLL 1
-#endif /* ! STOCKDISTRIBUTOR_STUB_HAS_DLL */
-
-#if defined (STOCKDISTRIBUTOR_STUB_HAS_DLL) && (STOCKDISTRIBUTOR_STUB_HAS_DLL == 1)
-#  if defined (STOCKDISTRIBUTOR_STUB_BUILD_DLL)
-#    define STOCKDISTRIBUTOR_STUB_Export ACE_Proper_Export_Flag
-#    define STOCKDISTRIBUTOR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCKDISTRIBUTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCKDISTRIBUTOR_STUB_BUILD_DLL */
-#    define STOCKDISTRIBUTOR_STUB_Export ACE_Proper_Import_Flag
-#    define STOCKDISTRIBUTOR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCKDISTRIBUTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCKDISTRIBUTOR_STUB_BUILD_DLL */
-#else /* STOCKDISTRIBUTOR_STUB_HAS_DLL == 1 */
-#  define STOCKDISTRIBUTOR_STUB_Export
-#  define STOCKDISTRIBUTOR_STUB_SINGLETON_DECLARATION(T)
-#  define STOCKDISTRIBUTOR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCKDISTRIBUTOR_STUB_HAS_DLL == 1 */
-
-// Set STOCKDISTRIBUTOR_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCKDISTRIBUTOR_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCKDISTRIBUTOR_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCKDISTRIBUTOR_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCKDISTRIBUTOR_STUB_NTRACE */
-
-#if (STOCKDISTRIBUTOR_STUB_NTRACE == 1)
-#  define STOCKDISTRIBUTOR_STUB_TRACE(X)
-#else /* (STOCKDISTRIBUTOR_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCKDISTRIBUTOR_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCKDISTRIBUTOR_STUB_NTRACE == 1) */
-
-#endif /* STOCKDISTRIBUTOR_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_svnt_export.h
deleted file mode 100644
index 722bf994de5..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_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 STOCKDISTRIBUTOR_SVNT
-// ------------------------------
-#ifndef STOCKDISTRIBUTOR_SVNT_EXPORT_H
-#define STOCKDISTRIBUTOR_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCKDISTRIBUTOR_SVNT_HAS_DLL)
-#  define STOCKDISTRIBUTOR_SVNT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCKDISTRIBUTOR_SVNT_HAS_DLL */
-
-#if !defined (STOCKDISTRIBUTOR_SVNT_HAS_DLL)
-#  define STOCKDISTRIBUTOR_SVNT_HAS_DLL 1
-#endif /* ! STOCKDISTRIBUTOR_SVNT_HAS_DLL */
-
-#if defined (STOCKDISTRIBUTOR_SVNT_HAS_DLL) && (STOCKDISTRIBUTOR_SVNT_HAS_DLL == 1)
-#  if defined (STOCKDISTRIBUTOR_SVNT_BUILD_DLL)
-#    define STOCKDISTRIBUTOR_SVNT_Export ACE_Proper_Export_Flag
-#    define STOCKDISTRIBUTOR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCKDISTRIBUTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCKDISTRIBUTOR_SVNT_BUILD_DLL */
-#    define STOCKDISTRIBUTOR_SVNT_Export ACE_Proper_Import_Flag
-#    define STOCKDISTRIBUTOR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCKDISTRIBUTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCKDISTRIBUTOR_SVNT_BUILD_DLL */
-#else /* STOCKDISTRIBUTOR_SVNT_HAS_DLL == 1 */
-#  define STOCKDISTRIBUTOR_SVNT_Export
-#  define STOCKDISTRIBUTOR_SVNT_SINGLETON_DECLARATION(T)
-#  define STOCKDISTRIBUTOR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCKDISTRIBUTOR_SVNT_HAS_DLL == 1 */
-
-// Set STOCKDISTRIBUTOR_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCKDISTRIBUTOR_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCKDISTRIBUTOR_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCKDISTRIBUTOR_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCKDISTRIBUTOR_SVNT_NTRACE */
-
-#if (STOCKDISTRIBUTOR_SVNT_NTRACE == 1)
-#  define STOCKDISTRIBUTOR_SVNT_TRACE(X)
-#else /* (STOCKDISTRIBUTOR_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCKDISTRIBUTOR_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCKDISTRIBUTOR_SVNT_NTRACE == 1) */
-
-#endif /* STOCKDISTRIBUTOR_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index 823c9206269..57287d29519 100644
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Stock_Base"
 
-project(Stock_Base_idl_gen) : ciaoidldefaults, anytypecode {
+project(Stock_Base_idl_gen) : componentidldefaults, anytypecode {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export \
               -Wb,stub_export_include=Stock_Base_stub_export.h \
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_export.h
deleted file mode 100644
index 58b80563f1c..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_skel_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 STOCK_BASE_SKEL
-// ------------------------------
-#ifndef STOCK_BASE_SKEL_EXPORT_H
-#define STOCK_BASE_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCK_BASE_SKEL_HAS_DLL)
-#  define STOCK_BASE_SKEL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCK_BASE_SKEL_HAS_DLL */
-
-#if !defined (STOCK_BASE_SKEL_HAS_DLL)
-#  define STOCK_BASE_SKEL_HAS_DLL 1
-#endif /* ! STOCK_BASE_SKEL_HAS_DLL */
-
-#if defined (STOCK_BASE_SKEL_HAS_DLL) && (STOCK_BASE_SKEL_HAS_DLL == 1)
-#  if defined (STOCK_BASE_SKEL_BUILD_DLL)
-#    define STOCK_BASE_SKEL_Export ACE_Proper_Export_Flag
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCK_BASE_SKEL_BUILD_DLL */
-#    define STOCK_BASE_SKEL_Export ACE_Proper_Import_Flag
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCK_BASE_SKEL_BUILD_DLL */
-#else /* STOCK_BASE_SKEL_HAS_DLL == 1 */
-#  define STOCK_BASE_SKEL_Export
-#  define STOCK_BASE_SKEL_SINGLETON_DECLARATION(T)
-#  define STOCK_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCK_BASE_SKEL_HAS_DLL == 1 */
-
-// Set STOCK_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCK_BASE_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCK_BASE_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCK_BASE_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCK_BASE_SKEL_NTRACE */
-
-#if (STOCK_BASE_SKEL_NTRACE == 1)
-#  define STOCK_BASE_SKEL_TRACE(X)
-#else /* (STOCK_BASE_SKEL_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCK_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCK_BASE_SKEL_NTRACE == 1) */
-
-#endif /* STOCK_BASE_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h b/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h
deleted file mode 100644
index ee95aa70b27..00000000000
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_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 STOCK_BASE_STUB
-// ------------------------------
-#ifndef STOCK_BASE_STUB_EXPORT_H
-#define STOCK_BASE_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (STOCK_BASE_STUB_HAS_DLL)
-#  define STOCK_BASE_STUB_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && STOCK_BASE_STUB_HAS_DLL */
-
-#if !defined (STOCK_BASE_STUB_HAS_DLL)
-#  define STOCK_BASE_STUB_HAS_DLL 1
-#endif /* ! STOCK_BASE_STUB_HAS_DLL */
-
-#if defined (STOCK_BASE_STUB_HAS_DLL) && (STOCK_BASE_STUB_HAS_DLL == 1)
-#  if defined (STOCK_BASE_STUB_BUILD_DLL)
-#    define STOCK_BASE_STUB_Export ACE_Proper_Export_Flag
-#    define STOCK_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define STOCK_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* STOCK_BASE_STUB_BUILD_DLL */
-#    define STOCK_BASE_STUB_Export ACE_Proper_Import_Flag
-#    define STOCK_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define STOCK_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* STOCK_BASE_STUB_BUILD_DLL */
-#else /* STOCK_BASE_STUB_HAS_DLL == 1 */
-#  define STOCK_BASE_STUB_Export
-#  define STOCK_BASE_STUB_SINGLETON_DECLARATION(T)
-#  define STOCK_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* STOCK_BASE_STUB_HAS_DLL == 1 */
-
-// Set STOCK_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (STOCK_BASE_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define STOCK_BASE_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define STOCK_BASE_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !STOCK_BASE_STUB_NTRACE */
-
-#if (STOCK_BASE_STUB_NTRACE == 1)
-#  define STOCK_BASE_STUB_TRACE(X)
-#else /* (STOCK_BASE_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define STOCK_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (STOCK_BASE_STUB_NTRACE == 1) */
-
-#endif /* STOCK_BASE_STUB_EXPORT_H */
-
-// End of auto generated file.