*** empty log message ***

24 files changed, 618 insertions, 356 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 5ca2497b17a..21c18524d85 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,52 @@
+Tue Mar 11 15:18:52 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+Tue Mar 11 14:55:50 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* bin/generate_component_mpc.pl: Added this new to auto-generate
+	  the mpc files for a single component implementation.  The mpc
+	  file generated by the script should work for most simple
+	  component implementation, without modification and can serve as
+	  a template for more complicated ones.  This script also
+	  generates hints that can be fed back to a shell to create the
+	  necessary export definition files.
+
+	* docs/todo.html: Added improvement items that can be done for
+	  generate_component_mpc.pl.
+
+	* bin/gen_export_files.cmd: Removed.  The new
+	  generate_component_mpc script provides more accurate hints on
+	  how to create export files.
+
+	* examples/handcrafted/Display/Display.mpc:
+	* examples/handcrafted/Display/HUD_skel_export.h:
+	* examples/handcrafted/Display/HUD_stub_export.h:
+	* examples/handcrafted/Display/GPS/GPS_skel_export.h:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay_skel_export.h:
+	* examples/handcrafted/Display/RateGen/RateGen_skel_export.h:
+	  Removed.
+
+	* examples/handcrafted/Display/HUDisplay.mpc:
+	* examples/handcrafted/Display/HUDisplay_stub_export.h:
+	* examples/handcrafted/Display/HUDisplay_svnt_export.h:
+	* examples/handcrafted/Display/GPS/GPS_exec_export.h:
+	* examples/handcrafted/Display/GPS/GPS_svnt_export.h:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay_exec_export.h:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay_svnt_export.h:
+	* examples/handcrafted/Display/RateGen/RateGen_exec_export.h:
+	* examples/handcrafted/Display/RateGen/RateGen_svnt_export.h:
+	  Modified.
+
+	* examples/handcrafted/Display/HUDisplay.idl:
+	* examples/handcrafted/Display/HUDisplayE.idl:
+	* examples/handcrafted/Display/GPS/GPS.mpc:
+	* examples/handcrafted/Display/GPS/GPS_stub_export.h:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay.mpc:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay_stub_export.h:
+	* examples/handcrafted/Display/RateGen/RateGen.idl:
+	* examples/handcrafted/Display/RateGen/RateGen.mpc:
+	* examples/handcrafted/Display/RateGen/RateGen_stub_export.h:
+	  Added.
+
 Tue Mar 11 11:41:39 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* bin/generate_component_mpc.pl: Added a MPC file generater perl
diff --git a/TAO/CIAO/bin/gen_export_files.cmd b/TAO/CIAO/bin/gen_export_files.cmd
deleted file mode 100755
index 3731757764a..00000000000
--- a/TAO/CIAO/bin/gen_export_files.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-REM $Id$
-
-..\..\..\bin\generate_export_file.pl %1_STUB > %1_stub_export.h
-..\..\..\bin\generate_export_file.pl %1_SERVANT > %1_servant_export.h
-..\..\..\bin\generate_export_file.pl %1_EXECUTOR > %1_executor_export.h
diff --git a/TAO/CIAO/bin/generate_component_mpc.pl b/TAO/CIAO/bin/generate_component_mpc.pl
index e82ce2d5eff..079ee613f71 100755
--- a/TAO/CIAO/bin/generate_component_mpc.pl
+++ b/TAO/CIAO/bin/generate_component_mpc.pl
@@ -12,16 +12,16 @@ use Getopt::Std;
 
 $flags = join (" ", @ARGV);
 
-if (!getopts ('dcnf:h') || $opt_h) {
+if (!getopts ('dcnp:h') || $opt_h) {
     print "generate_component_mpc.pl [-d] [-h] component_name\n";
     print "\n";
     print "    -d         Turn on debug mode\n";
-    print "    -f         Currently not used\n";
+    print "    -p         Dependent component name\n";
     print "    -n         Supress component make/project\n";
     print "    -c         Create a client makefile\n";
     print "\n";
-    print "generate_component_mpc creates the minimum mpc file that\n";
-    print "is needed for a single component implementation\n";
+    print "generate_component_mpc creates and save a minimum mpc file\n";
+    print "called $com_name.mpc that is needed for a single component implementation\n";
     exit (1);
 }
 
@@ -45,6 +45,12 @@ $UCOM_NAME = uc $com_name;
 ##############################################################################
 # Prologue
 
+if (defined $opt_p) {
+    $stub_depend = "depends += $opt_p".'_stub';
+    $svnt_depend = "$opt_p".'_svnt';
+    $lib_depend = "$opt_t".'_stub';
+}
+
 if (defined $opt_c) {
     $client_def =
 '
@@ -68,7 +74,7 @@ if (! defined $opt_n) {
 project('."$com_name".'_exec) : ciao_server {
   depends   += '."$com_name".'_svnt
   sharedname = '."$com_name".'_exec
-  libs      += '."$com_name".'_stub '."$com_name".'_svnt
+  libs      += '."$com_name".'_stub '."$lib_depend $com_name".'_svnt
   dllflags   = '."$UCOM_NAME".'_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -82,10 +88,9 @@ project('."$com_name".'_exec) : ciao_server {
 }
 
 $mpc_template = '
-project('."$com_name".'_stub): ciao_client {
+project('."$com_name".'_stub): ciao_client {'."
+  $stub_depend".'
   sharedname = '."$com_name".'_stub
-  idlflags += -I $(TAO_ROOT)/CIAO -I $(TAO_ROOT) -I $(TAO_ROOT)/orbsvcs/orbsvcs
-  idlflags +=  -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
   idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export -Wb,stub_export_include='."$com_name".'_stub_export.h -Wb,skel_export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,skel_export_include='."$com_name".'_svnt_export.h
   dllflags   = '."$UCOM_NAME".'_STUB_BUILD_DLL
 
@@ -99,10 +104,10 @@ project('."$com_name".'_stub): ciao_client {
 }
 
 project('."$com_name".'_svnt) : ciao_server {
-  depends += '."$com_name".'_stub
+  depends += '."$svnt_depend $com_name".'_stub
   sharedname  = '."$com_name".'_svnt
-  libs    += '."$com_name".'_stub
-  idlflags  +=  -I $(TAO_ROOT)/CIAO -I $(TAO_ROOT) -I $(TAO_ROOT)orbsvcs/orbsvcs -Wb,export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,export_include='."$com_name".'_svnt_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
+  libs    += '."$com_name".'_stub'." $lib_depend".'
+  idlflags  +=  -Wb,export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,export_include='."$com_name".'_svnt_export.h
   dllflags = '."$UCOM_NAME".'_SVNT_BUILD_DLL
 
   IDL_Files {
@@ -128,4 +133,13 @@ $client_def
 # Print the stuff out
 
 
-print $mpc_template;
+# MPC files
+open (MPCFILE, ">", "$com_name".".mpc");
+print MPCFILE $mpc_template;
+
+print "Run the following command also:\n\n";
+print "\tgenerate_export_file.pl $UCOM_NAME".'_STUB > '."$com_name".'_stub_export.h'."\n";
+print "\tgenerate_export_file.pl $UCOM_NAME".'_SVNT > '."$com_name".'_svnt_export.h'."\n";
+if (! defined $opt_n) {
+    print "\tgenerate_export_file.pl $UCOM_NAME".'_EXEC > '."$com_name".'_exec_export.h'."\n";
+}
diff --git a/TAO/CIAO/examples/handcrafted/Display/Display.mpc b/TAO/CIAO/examples/handcrafted/Display/Display.mpc
deleted file mode 100644
index bae21d7ac52..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/Display.mpc
+++ /dev/null
@@ -1,29 +0,0 @@
-project (HUD_stub) : ciao_client {
-  sharedname = HUD_stub
-  dllflags  = HUD_STUB_BUILD_DLL
-  idlflags  += -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs -Wb,stub_export_macro=HUD_STUB_Export -Wb,stub_export_include=HUD_stub_export.h -Wb,skel_export_macro=HUD_SKEL_Export -Wb,skel_export_include=HUD_skel_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
-
-  IDL_Files {
-    HUDisplay.idl
-  }
-
-  Source_Files {
-    HUDisplayC.cpp
-  }
-}
-
-project (HUD_skel) : ciao_component {
-  depends += HUD_stub
-  sharedname = HUD_skel
-  dllflags  = HUD_SKEL_BUILD_DLL
-  idlflags  += -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs -Wb,export_macro=HUD_SKEL_Export -Wb,export_include=HUD_skel_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
-
-  IDL_Files {
-    HUDisplayE.idl
-  }
-
-  Source_Files {
-    HUDisplayS.cpp
-    HUDisplayEC.cpp
-  }
-}
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
index e4b29482927..80ab9e77968 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
@@ -1,8 +1,9 @@
-project (GPS_stub) : ciao_client {
-  depends += HUD_stub
+
+project(GPS_stub): ciao_client {
+  depends += HUDisplay_stub
   sharedname = GPS_stub
-  dllflags  = GPS_STUB_BUILD_DLL
-  idlflags  += -I ../../../.. -I ../../../../.. -I ../../../../../orbsvcs/orbsvcs -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SKEL_Export -Wb,skel_export_include=GPS_skel_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
+  idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
+  dllflags   = GPS_STUB_BUILD_DLL
 
   IDL_Files {
     GPS.idl
@@ -13,17 +14,38 @@ project (GPS_stub) : ciao_client {
   }
 }
 
-project (GPS_skel) : ciao_component {
-  depends += HUD_skel GPS_stub
-  sharedname = GPS_skel
-  dllflags  = GPS_SKEL_BUILD_DLL
-  libpaths += ..
-  libs += GPS_stub HUD_stub
+project(GPS_svnt) : ciao_server {
+  depends += HUDisplay_svnt GPS_stub
+  sharedname  = GPS_svnt
+  libs    += GPS_stub _stub
+  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
+  dllflags = GPS_SVNT_BUILD_DLL
 
   IDL_Files {
+    GPSE.idl
   }
 
   Source_Files {
+    GPS_svnt.cpp
     GPSS.cpp
+    GPSEC.cpp
+  }
+}
+
+
+project(GPS_exec) : ciao_server {
+  depends   += GPS_svnt
+  sharedname = GPS_exec
+  libs      += GPS_stub _stub GPS_svnt
+  dllflags   = GPS_EXEC_BUILD_DLL
+
+  IDL_Files {
   }
-}
\ No newline at end of file
+
+  Source_Files {
+    GPS_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec_export.h b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec_export.h
new file mode 100644
index 00000000000..a4fec34a45d
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_exec_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl GPS_EXEC
+// ------------------------------
+#ifndef GPS_EXEC_EXPORT_H
+#define GPS_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (GPS_EXEC_HAS_DLL)
+#  define GPS_EXEC_HAS_DLL 1
+#endif /* ! GPS_EXEC_HAS_DLL */
+
+#if defined (GPS_EXEC_HAS_DLL) && (GPS_EXEC_HAS_DLL == 1)
+#  if defined (GPS_EXEC_BUILD_DLL)
+#    define GPS_EXEC_Export ACE_Proper_Export_Flag
+#    define GPS_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define GPS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* GPS_EXEC_BUILD_DLL */
+#    define GPS_EXEC_Export ACE_Proper_Import_Flag
+#    define GPS_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define GPS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* GPS_EXEC_BUILD_DLL */
+#else /* GPS_EXEC_HAS_DLL == 1 */
+#  define GPS_EXEC_Export
+#  define GPS_EXEC_SINGLETON_DECLARATION(T)
+#  define GPS_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* GPS_EXEC_HAS_DLL == 1 */
+
+// Set GPS_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (GPS_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define GPS_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define GPS_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !GPS_EXEC_NTRACE */
+
+#if (GPS_EXEC_NTRACE == 1)
+#  define GPS_EXEC_TRACE(X)
+#else /* (GPS_EXEC_NTRACE == 1) */
+#  define GPS_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (GPS_EXEC_NTRACE == 1) */
+
+#endif /* GPS_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_skel_export.h b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_skel_export.h
deleted file mode 100644
index d6103bdcd6d..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_skel_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl GPS_SKEL
-// ------------------------------
-#ifndef GPS_SKEL_EXPORT_H
-#define GPS_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (GPS_SKEL_HAS_DLL)
-#  define GPS_SKEL_HAS_DLL 1
-#endif /* ! GPS_SKEL_HAS_DLL */
-
-#if defined (GPS_SKEL_HAS_DLL) && (GPS_SKEL_HAS_DLL == 1)
-#  if defined (GPS_SKEL_BUILD_DLL)
-#    define GPS_SKEL_Export ACE_Proper_Export_Flag
-#    define GPS_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define GPS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* GPS_SKEL_BUILD_DLL */
-#    define GPS_SKEL_Export ACE_Proper_Import_Flag
-#    define GPS_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define GPS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* GPS_SKEL_BUILD_DLL */
-#else /* GPS_SKEL_HAS_DLL == 1 */
-#  define GPS_SKEL_Export
-#  define GPS_SKEL_SINGLETON_DECLARATION(T)
-#  define GPS_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* GPS_SKEL_HAS_DLL == 1 */
-
-// Set GPS_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (GPS_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define GPS_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define GPS_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !GPS_SKEL_NTRACE */
-
-#if (GPS_SKEL_NTRACE == 1)
-#  define GPS_SKEL_TRACE(X)
-#else /* (GPS_SKEL_NTRACE == 1) */
-#  define GPS_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (GPS_SKEL_NTRACE == 1) */
-
-#endif /* GPS_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt_export.h b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt_export.h
new file mode 100644
index 00000000000..8ddf3049093
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl GPS_SVNT
+// ------------------------------
+#ifndef GPS_SVNT_EXPORT_H
+#define GPS_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (GPS_SVNT_HAS_DLL)
+#  define GPS_SVNT_HAS_DLL 1
+#endif /* ! GPS_SVNT_HAS_DLL */
+
+#if defined (GPS_SVNT_HAS_DLL) && (GPS_SVNT_HAS_DLL == 1)
+#  if defined (GPS_SVNT_BUILD_DLL)
+#    define GPS_SVNT_Export ACE_Proper_Export_Flag
+#    define GPS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define GPS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* GPS_SVNT_BUILD_DLL */
+#    define GPS_SVNT_Export ACE_Proper_Import_Flag
+#    define GPS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define GPS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* GPS_SVNT_BUILD_DLL */
+#else /* GPS_SVNT_HAS_DLL == 1 */
+#  define GPS_SVNT_Export
+#  define GPS_SVNT_SINGLETON_DECLARATION(T)
+#  define GPS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* GPS_SVNT_HAS_DLL == 1 */
+
+// Set GPS_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (GPS_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define GPS_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define GPS_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !GPS_SVNT_NTRACE */
+
+#if (GPS_SVNT_NTRACE == 1)
+#  define GPS_SVNT_TRACE(X)
+#else /* (GPS_SVNT_NTRACE == 1) */
+#  define GPS_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (GPS_SVNT_NTRACE == 1) */
+
+#endif /* GPS_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUD_skel_export.h b/TAO/CIAO/examples/handcrafted/Display/HUD_skel_export.h
deleted file mode 100644
index c7e111d65e4..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/HUD_skel_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl HUD_SKEL
-// ------------------------------
-#ifndef HUD_SKEL_EXPORT_H
-#define HUD_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (HUD_SKEL_HAS_DLL)
-#  define HUD_SKEL_HAS_DLL 1
-#endif /* ! HUD_SKEL_HAS_DLL */
-
-#if defined (HUD_SKEL_HAS_DLL) && (HUD_SKEL_HAS_DLL == 1)
-#  if defined (HUD_SKEL_BUILD_DLL)
-#    define HUD_SKEL_Export ACE_Proper_Export_Flag
-#    define HUD_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define HUD_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* HUD_SKEL_BUILD_DLL */
-#    define HUD_SKEL_Export ACE_Proper_Import_Flag
-#    define HUD_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define HUD_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* HUD_SKEL_BUILD_DLL */
-#else /* HUD_SKEL_HAS_DLL == 1 */
-#  define HUD_SKEL_Export
-#  define HUD_SKEL_SINGLETON_DECLARATION(T)
-#  define HUD_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* HUD_SKEL_HAS_DLL == 1 */
-
-// Set HUD_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (HUD_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define HUD_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define HUD_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !HUD_SKEL_NTRACE */
-
-#if (HUD_SKEL_NTRACE == 1)
-#  define HUD_SKEL_TRACE(X)
-#else /* (HUD_SKEL_NTRACE == 1) */
-#  define HUD_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (HUD_SKEL_NTRACE == 1) */
-
-#endif /* HUD_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUD_stub_export.h b/TAO/CIAO/examples/handcrafted/Display/HUD_stub_export.h
deleted file mode 100644
index e4d2a4fde55..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/HUD_stub_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl HUD_STUB
-// ------------------------------
-#ifndef HUD_STUB_EXPORT_H
-#define HUD_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (HUD_STUB_HAS_DLL)
-#  define HUD_STUB_HAS_DLL 1
-#endif /* ! HUD_STUB_HAS_DLL */
-
-#if defined (HUD_STUB_HAS_DLL) && (HUD_STUB_HAS_DLL == 1)
-#  if defined (HUD_STUB_BUILD_DLL)
-#    define HUD_STUB_Export ACE_Proper_Export_Flag
-#    define HUD_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define HUD_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* HUD_STUB_BUILD_DLL */
-#    define HUD_STUB_Export ACE_Proper_Import_Flag
-#    define HUD_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define HUD_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* HUD_STUB_BUILD_DLL */
-#else /* HUD_STUB_HAS_DLL == 1 */
-#  define HUD_STUB_Export
-#  define HUD_STUB_SINGLETON_DECLARATION(T)
-#  define HUD_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* HUD_STUB_HAS_DLL == 1 */
-
-// Set HUD_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (HUD_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define HUD_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define HUD_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !HUD_STUB_NTRACE */
-
-#if (HUD_STUB_NTRACE == 1)
-#  define HUD_STUB_TRACE(X)
-#else /* (HUD_STUB_NTRACE == 1) */
-#  define HUD_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (HUD_STUB_NTRACE == 1) */
-
-#endif /* HUD_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.idl b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.idl
index 05c0ad7d248..9a799995165 100644
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.idl
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.idl
@@ -13,18 +13,6 @@
 module HUDisplay
 {
   /**
-   * @brief interface opmode defines the "operation mode" interface.
-   */
-  interface opmode
-  {
-    void start ();
-
-    void stop ();
-
-    boolean active ();
-  };
-
-  /**
    * @brief a timed event that happens at some fix rate.
    */
   eventtype tick
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
new file mode 100644
index 00000000000..da5fa8a1c89
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
@@ -0,0 +1,33 @@
+
+project(HUDisplay_stub): ciao_client {
+
+  sharedname = HUDisplay_stub
+  idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h
+  dllflags   = HUDISPLAY_STUB_BUILD_DLL
+
+  IDL_Files {
+    HUDisplay.idl
+  }
+
+  Source_Files {
+    HUDisplayC.cpp
+  }
+}
+
+project(HUDisplay_svnt) : ciao_server {
+  depends +=  HUDisplay_stub
+  sharedname  = HUDisplay_svnt
+  libs    += HUDisplay_stub
+  idlflags  +=  -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h
+  dllflags = HUDISPLAY_SVNT_BUILD_DLL
+
+  IDL_Files {
+    HUDisplayE.idl
+  }
+
+  Source_Files {
+    HUDisplay_svnt.cpp
+    HUDisplayS.cpp
+    HUDisplayEC.cpp
+  }
+}
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplayE.idl b/TAO/CIAO/examples/handcrafted/Display/HUDisplayE.idl
index 8fe3e3efaab..db5623f8e0f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplayE.idl
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplayE.idl
@@ -15,10 +15,9 @@
 module HUDisplay
 {
   /**
-   * @brief executor interface for tick event comsumers.  I don't
-   * really know why this interface is necessary.  I don't think it's
-   * even used anywhere in the component that consume the event type.
-   * It's, however, in the spec.
+   * Executor interface for tick event comsumers.  This interface is
+   * only needed if a component implementation uses the
+   * ExecutorLocator strategy.
    */
   local interface CCM_tickConsumer
     {
@@ -26,10 +25,11 @@ module HUDisplay
     };
 
   /**
-   * @brief executor interface for position facet interface that
-   * allows querying of a coordination.
+   * Executor interface for position facet interface that allows
+   * querying of a coordination.
    */
   local interface CCM_position : position
   {
+    long pos ();
   };
 };
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay_stub_export.h b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_stub_export.h
new file mode 100644
index 00000000000..3c92ba87bd8
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_stub_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl HUDISPLAY_STUB
+// ------------------------------
+#ifndef HUDISPLAY_STUB_EXPORT_H
+#define HUDISPLAY_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (HUDISPLAY_STUB_HAS_DLL)
+#  define HUDISPLAY_STUB_HAS_DLL 1
+#endif /* ! HUDISPLAY_STUB_HAS_DLL */
+
+#if defined (HUDISPLAY_STUB_HAS_DLL) && (HUDISPLAY_STUB_HAS_DLL == 1)
+#  if defined (HUDISPLAY_STUB_BUILD_DLL)
+#    define HUDISPLAY_STUB_Export ACE_Proper_Export_Flag
+#    define HUDISPLAY_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define HUDISPLAY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* HUDISPLAY_STUB_BUILD_DLL */
+#    define HUDISPLAY_STUB_Export ACE_Proper_Import_Flag
+#    define HUDISPLAY_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define HUDISPLAY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* HUDISPLAY_STUB_BUILD_DLL */
+#else /* HUDISPLAY_STUB_HAS_DLL == 1 */
+#  define HUDISPLAY_STUB_Export
+#  define HUDISPLAY_STUB_SINGLETON_DECLARATION(T)
+#  define HUDISPLAY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* HUDISPLAY_STUB_HAS_DLL == 1 */
+
+// Set HUDISPLAY_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (HUDISPLAY_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define HUDISPLAY_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define HUDISPLAY_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !HUDISPLAY_STUB_NTRACE */
+
+#if (HUDISPLAY_STUB_NTRACE == 1)
+#  define HUDISPLAY_STUB_TRACE(X)
+#else /* (HUDISPLAY_STUB_NTRACE == 1) */
+#  define HUDISPLAY_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (HUDISPLAY_STUB_NTRACE == 1) */
+
+#endif /* HUDISPLAY_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt_export.h b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt_export.h
new file mode 100644
index 00000000000..842152afa02
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl HUDISPLAY_SVNT
+// ------------------------------
+#ifndef HUDISPLAY_SVNT_EXPORT_H
+#define HUDISPLAY_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (HUDISPLAY_SVNT_HAS_DLL)
+#  define HUDISPLAY_SVNT_HAS_DLL 1
+#endif /* ! HUDISPLAY_SVNT_HAS_DLL */
+
+#if defined (HUDISPLAY_SVNT_HAS_DLL) && (HUDISPLAY_SVNT_HAS_DLL == 1)
+#  if defined (HUDISPLAY_SVNT_BUILD_DLL)
+#    define HUDISPLAY_SVNT_Export ACE_Proper_Export_Flag
+#    define HUDISPLAY_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define HUDISPLAY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* HUDISPLAY_SVNT_BUILD_DLL */
+#    define HUDISPLAY_SVNT_Export ACE_Proper_Import_Flag
+#    define HUDISPLAY_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define HUDISPLAY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* HUDISPLAY_SVNT_BUILD_DLL */
+#else /* HUDISPLAY_SVNT_HAS_DLL == 1 */
+#  define HUDISPLAY_SVNT_Export
+#  define HUDISPLAY_SVNT_SINGLETON_DECLARATION(T)
+#  define HUDISPLAY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* HUDISPLAY_SVNT_HAS_DLL == 1 */
+
+// Set HUDISPLAY_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (HUDISPLAY_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define HUDISPLAY_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define HUDISPLAY_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !HUDISPLAY_SVNT_NTRACE */
+
+#if (HUDISPLAY_SVNT_NTRACE == 1)
+#  define HUDISPLAY_SVNT_TRACE(X)
+#else /* (HUDISPLAY_SVNT_NTRACE == 1) */
+#  define HUDISPLAY_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (HUDISPLAY_SVNT_NTRACE == 1) */
+
+#endif /* HUDISPLAY_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
index 730efe9776f..dee7fbe50ed 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
@@ -1,8 +1,9 @@
-project (NavDisplay_stub) : ciao_client {
-  depends += HUD_stub
+
+project(NavDisplay_stub): ciao_client {
+  depends += HUDisplay_stub
   sharedname = NavDisplay_stub
-  dllflags  = NAVDISPLAY_STUB_BUILD_DLL
-  idlflags  += -I ../../../.. -I ../../../../.. -I ../../../../../orbsvcs/orbsvcs -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SKEL_Export -Wb,skel_export_include=NavDisplay_skel_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
+  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h
+  dllflags   = NAVDISPLAY_STUB_BUILD_DLL
 
   IDL_Files {
     NavDisplay.idl
@@ -13,17 +14,38 @@ project (NavDisplay_stub) : ciao_client {
   }
 }
 
-project (NavDisplay_skel) : ciao_component {
-  depends += HUD_skel NavDisplay_stub
-  sharedname = NavDisplay_skel
-  dllflags  = NAVDISPLAY_SKEL_BUILD_DLL
-  libpaths += ..
-  libs += NavDisplay_stub HUD_stub
+project(NavDisplay_svnt) : ciao_server {
+  depends += HUDisplay_svnt NavDisplay_stub
+  sharedname  = NavDisplay_svnt
+  libs    += NavDisplay_stub _stub
+  idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
+  dllflags = NAVDISPLAY_SVNT_BUILD_DLL
 
   IDL_Files {
+    NavDisplayE.idl
   }
 
   Source_Files {
+    NavDisplay_svnt.cpp
     NavDisplayS.cpp
+    NavDisplayEC.cpp
+  }
+}
+
+
+project(NavDisplay_exec) : ciao_server {
+  depends   += NavDisplay_svnt
+  sharedname = NavDisplay_exec
+  libs      += NavDisplay_stub _stub NavDisplay_svnt
+  dllflags   = NAVDISPLAY_EXEC_BUILD_DLL
+
+  IDL_Files {
   }
-}
\ No newline at end of file
+
+  Source_Files {
+    NavDisplay_exec.cpp
+  }
+}
+
+
+
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec_export.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec_export.h
new file mode 100644
index 00000000000..81b8dae8a88
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_exec_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NAVDISPLAY_EXEC
+// ------------------------------
+#ifndef NAVDISPLAY_EXEC_EXPORT_H
+#define NAVDISPLAY_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (NAVDISPLAY_EXEC_HAS_DLL)
+#  define NAVDISPLAY_EXEC_HAS_DLL 1
+#endif /* ! NAVDISPLAY_EXEC_HAS_DLL */
+
+#if defined (NAVDISPLAY_EXEC_HAS_DLL) && (NAVDISPLAY_EXEC_HAS_DLL == 1)
+#  if defined (NAVDISPLAY_EXEC_BUILD_DLL)
+#    define NAVDISPLAY_EXEC_Export ACE_Proper_Export_Flag
+#    define NAVDISPLAY_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NAVDISPLAY_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NAVDISPLAY_EXEC_BUILD_DLL */
+#    define NAVDISPLAY_EXEC_Export ACE_Proper_Import_Flag
+#    define NAVDISPLAY_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NAVDISPLAY_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NAVDISPLAY_EXEC_BUILD_DLL */
+#else /* NAVDISPLAY_EXEC_HAS_DLL == 1 */
+#  define NAVDISPLAY_EXEC_Export
+#  define NAVDISPLAY_EXEC_SINGLETON_DECLARATION(T)
+#  define NAVDISPLAY_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NAVDISPLAY_EXEC_HAS_DLL == 1 */
+
+// Set NAVDISPLAY_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NAVDISPLAY_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NAVDISPLAY_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NAVDISPLAY_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NAVDISPLAY_EXEC_NTRACE */
+
+#if (NAVDISPLAY_EXEC_NTRACE == 1)
+#  define NAVDISPLAY_EXEC_TRACE(X)
+#else /* (NAVDISPLAY_EXEC_NTRACE == 1) */
+#  define NAVDISPLAY_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (NAVDISPLAY_EXEC_NTRACE == 1) */
+
+#endif /* NAVDISPLAY_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_skel_export.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_skel_export.h
deleted file mode 100644
index 3115a370b4c..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_skel_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl NAVDISPLAY_SKEL
-// ------------------------------
-#ifndef NAVDISPLAY_SKEL_EXPORT_H
-#define NAVDISPLAY_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (NAVDISPLAY_SKEL_HAS_DLL)
-#  define NAVDISPLAY_SKEL_HAS_DLL 1
-#endif /* ! NAVDISPLAY_SKEL_HAS_DLL */
-
-#if defined (NAVDISPLAY_SKEL_HAS_DLL) && (NAVDISPLAY_SKEL_HAS_DLL == 1)
-#  if defined (NAVDISPLAY_SKEL_BUILD_DLL)
-#    define NAVDISPLAY_SKEL_Export ACE_Proper_Export_Flag
-#    define NAVDISPLAY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NAVDISPLAY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NAVDISPLAY_SKEL_BUILD_DLL */
-#    define NAVDISPLAY_SKEL_Export ACE_Proper_Import_Flag
-#    define NAVDISPLAY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NAVDISPLAY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NAVDISPLAY_SKEL_BUILD_DLL */
-#else /* NAVDISPLAY_SKEL_HAS_DLL == 1 */
-#  define NAVDISPLAY_SKEL_Export
-#  define NAVDISPLAY_SKEL_SINGLETON_DECLARATION(T)
-#  define NAVDISPLAY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NAVDISPLAY_SKEL_HAS_DLL == 1 */
-
-// Set NAVDISPLAY_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NAVDISPLAY_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NAVDISPLAY_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NAVDISPLAY_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NAVDISPLAY_SKEL_NTRACE */
-
-#if (NAVDISPLAY_SKEL_NTRACE == 1)
-#  define NAVDISPLAY_SKEL_TRACE(X)
-#else /* (NAVDISPLAY_SKEL_NTRACE == 1) */
-#  define NAVDISPLAY_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (NAVDISPLAY_SKEL_NTRACE == 1) */
-
-#endif /* NAVDISPLAY_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt_export.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt_export.h
new file mode 100644
index 00000000000..6fdaae1163f
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NAVDISPLAY_SVNT
+// ------------------------------
+#ifndef NAVDISPLAY_SVNT_EXPORT_H
+#define NAVDISPLAY_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (NAVDISPLAY_SVNT_HAS_DLL)
+#  define NAVDISPLAY_SVNT_HAS_DLL 1
+#endif /* ! NAVDISPLAY_SVNT_HAS_DLL */
+
+#if defined (NAVDISPLAY_SVNT_HAS_DLL) && (NAVDISPLAY_SVNT_HAS_DLL == 1)
+#  if defined (NAVDISPLAY_SVNT_BUILD_DLL)
+#    define NAVDISPLAY_SVNT_Export ACE_Proper_Export_Flag
+#    define NAVDISPLAY_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NAVDISPLAY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NAVDISPLAY_SVNT_BUILD_DLL */
+#    define NAVDISPLAY_SVNT_Export ACE_Proper_Import_Flag
+#    define NAVDISPLAY_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NAVDISPLAY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NAVDISPLAY_SVNT_BUILD_DLL */
+#else /* NAVDISPLAY_SVNT_HAS_DLL == 1 */
+#  define NAVDISPLAY_SVNT_Export
+#  define NAVDISPLAY_SVNT_SINGLETON_DECLARATION(T)
+#  define NAVDISPLAY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NAVDISPLAY_SVNT_HAS_DLL == 1 */
+
+// Set NAVDISPLAY_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NAVDISPLAY_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NAVDISPLAY_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NAVDISPLAY_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NAVDISPLAY_SVNT_NTRACE */
+
+#if (NAVDISPLAY_SVNT_NTRACE == 1)
+#  define NAVDISPLAY_SVNT_TRACE(X)
+#else /* (NAVDISPLAY_SVNT_NTRACE == 1) */
+#  define NAVDISPLAY_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (NAVDISPLAY_SVNT_NTRACE == 1) */
+
+#endif /* NAVDISPLAY_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.idl b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.idl
index f1fc55b48a0..112f83d033a 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.idl
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.idl
@@ -12,6 +12,18 @@
 
 module HUDisplay
 {
+  /**
+   * @brief interface opmode defines the "operation mode" interface.
+   */
+  interface opmode
+  {
+    void start ();
+
+    void stop ();
+
+    boolean active ();
+  };
+
   component RateGen supports opmode
     {
       publishes tick Pulse;
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
index 8d2a969e6c4..5c1bd342df2 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
@@ -1,8 +1,9 @@
-project (RateGen_stub) : ciao_client {
-  depends += HUD_stub
+
+project(RateGen_stub): ciao_client {
+  depends += HUDisplay_stub
   sharedname = RateGen_stub
-  dllflags  = RATEGEN_STUB_BUILD_DLL
-  idlflags  += -I ../../../.. -I ../../../../.. -I ../../../../../orbsvcs/orbsvcs -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SKEL_Export -Wb,skel_export_include=RateGen_skel_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
+  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
+  dllflags   = RATEGEN_STUB_BUILD_DLL
 
   IDL_Files {
     RateGen.idl
@@ -13,33 +14,38 @@ project (RateGen_stub) : ciao_client {
   }
 }
 
-project (RateGen_skel) : ciao_component {
-  depends += HUD_skel RateGen_stub
-  sharedname = RateGen_skel
-  dllflags  = RATEGEN_SKEL_BUILD_DLL
-  idlflags  += -I ../../../.. -I ../../../../.. -I ../../../../../orbsvcs/orbsvcs -Wb,export_macro=RATEGEN_SKEL_Export -Wb,export_include=RateGen_skel_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
-  libpaths += ..
-  libs += RateGen_stub HUD_stub
+project(RateGen_svnt) : ciao_server {
+  depends += HUDisplay_svnt RateGen_stub
+  sharedname  = RateGen_svnt
+  libs    += RateGen_stub _stub
+  idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
+  dllflags = RATEGEN_SVNT_BUILD_DLL
 
   IDL_Files {
     RateGenE.idl
   }
 
   Source_Files {
+    RateGen_svnt.cpp
     RateGenS.cpp
-    RateGen_Glues.cpp
     RateGenEC.cpp
   }
 }
 
-project (RateGen_Impl) : ciao_component {
-  depends += RateGen_skel
-  sharedname = RateGen_Impl
-  dllflags = RATEGEN_IMPL_BUILD_DLL
-  libpaths += ..
-  libs += RateGen_stub HUD_stub RateGen_skel
+
+project(RateGen_exec) : ciao_server {
+  depends   += RateGen_svnt
+  sharedname = RateGen_exec
+  libs      += RateGen_stub _stub RateGen_svnt
+  dllflags   = RATEGEN_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
 
   Source_Files {
-    RateGen_Impl.cpp
+    RateGen_exec.cpp
   }
-}
\ No newline at end of file
+}
+
+
+
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec_export.h b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec_export.h
new file mode 100644
index 00000000000..3893178879b
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_exec_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl RATEGEN_EXEC
+// ------------------------------
+#ifndef RATEGEN_EXEC_EXPORT_H
+#define RATEGEN_EXEC_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (RATEGEN_EXEC_HAS_DLL)
+#  define RATEGEN_EXEC_HAS_DLL 1
+#endif /* ! RATEGEN_EXEC_HAS_DLL */
+
+#if defined (RATEGEN_EXEC_HAS_DLL) && (RATEGEN_EXEC_HAS_DLL == 1)
+#  if defined (RATEGEN_EXEC_BUILD_DLL)
+#    define RATEGEN_EXEC_Export ACE_Proper_Export_Flag
+#    define RATEGEN_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define RATEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* RATEGEN_EXEC_BUILD_DLL */
+#    define RATEGEN_EXEC_Export ACE_Proper_Import_Flag
+#    define RATEGEN_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define RATEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* RATEGEN_EXEC_BUILD_DLL */
+#else /* RATEGEN_EXEC_HAS_DLL == 1 */
+#  define RATEGEN_EXEC_Export
+#  define RATEGEN_EXEC_SINGLETON_DECLARATION(T)
+#  define RATEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* RATEGEN_EXEC_HAS_DLL == 1 */
+
+// Set RATEGEN_EXEC_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (RATEGEN_EXEC_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define RATEGEN_EXEC_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define RATEGEN_EXEC_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !RATEGEN_EXEC_NTRACE */
+
+#if (RATEGEN_EXEC_NTRACE == 1)
+#  define RATEGEN_EXEC_TRACE(X)
+#else /* (RATEGEN_EXEC_NTRACE == 1) */
+#  define RATEGEN_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (RATEGEN_EXEC_NTRACE == 1) */
+
+#endif /* RATEGEN_EXEC_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_skel_export.h b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_skel_export.h
deleted file mode 100644
index 1853635f605..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_skel_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl RATEGEN_SKEL
-// ------------------------------
-#ifndef RATEGEN_SKEL_EXPORT_H
-#define RATEGEN_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (RATEGEN_SKEL_HAS_DLL)
-#  define RATEGEN_SKEL_HAS_DLL 1
-#endif /* ! RATEGEN_SKEL_HAS_DLL */
-
-#if defined (RATEGEN_SKEL_HAS_DLL) && (RATEGEN_SKEL_HAS_DLL == 1)
-#  if defined (RATEGEN_SKEL_BUILD_DLL)
-#    define RATEGEN_SKEL_Export ACE_Proper_Export_Flag
-#    define RATEGEN_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define RATEGEN_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* RATEGEN_SKEL_BUILD_DLL */
-#    define RATEGEN_SKEL_Export ACE_Proper_Import_Flag
-#    define RATEGEN_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define RATEGEN_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* RATEGEN_SKEL_BUILD_DLL */
-#else /* RATEGEN_SKEL_HAS_DLL == 1 */
-#  define RATEGEN_SKEL_Export
-#  define RATEGEN_SKEL_SINGLETON_DECLARATION(T)
-#  define RATEGEN_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* RATEGEN_SKEL_HAS_DLL == 1 */
-
-// Set RATEGEN_SKEL_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (RATEGEN_SKEL_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define RATEGEN_SKEL_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define RATEGEN_SKEL_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !RATEGEN_SKEL_NTRACE */
-
-#if (RATEGEN_SKEL_NTRACE == 1)
-#  define RATEGEN_SKEL_TRACE(X)
-#else /* (RATEGEN_SKEL_NTRACE == 1) */
-#  define RATEGEN_SKEL_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (RATEGEN_SKEL_NTRACE == 1) */
-
-#endif /* RATEGEN_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt_export.h b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt_export.h
new file mode 100644
index 00000000000..ad773523aa8
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen_svnt_export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl RATEGEN_SVNT
+// ------------------------------
+#ifndef RATEGEN_SVNT_EXPORT_H
+#define RATEGEN_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (RATEGEN_SVNT_HAS_DLL)
+#  define RATEGEN_SVNT_HAS_DLL 1
+#endif /* ! RATEGEN_SVNT_HAS_DLL */
+
+#if defined (RATEGEN_SVNT_HAS_DLL) && (RATEGEN_SVNT_HAS_DLL == 1)
+#  if defined (RATEGEN_SVNT_BUILD_DLL)
+#    define RATEGEN_SVNT_Export ACE_Proper_Export_Flag
+#    define RATEGEN_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define RATEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* RATEGEN_SVNT_BUILD_DLL */
+#    define RATEGEN_SVNT_Export ACE_Proper_Import_Flag
+#    define RATEGEN_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define RATEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* RATEGEN_SVNT_BUILD_DLL */
+#else /* RATEGEN_SVNT_HAS_DLL == 1 */
+#  define RATEGEN_SVNT_Export
+#  define RATEGEN_SVNT_SINGLETON_DECLARATION(T)
+#  define RATEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* RATEGEN_SVNT_HAS_DLL == 1 */
+
+// Set RATEGEN_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (RATEGEN_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define RATEGEN_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define RATEGEN_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !RATEGEN_SVNT_NTRACE */
+
+#if (RATEGEN_SVNT_NTRACE == 1)
+#  define RATEGEN_SVNT_TRACE(X)
+#else /* (RATEGEN_SVNT_NTRACE == 1) */
+#  define RATEGEN_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (RATEGEN_SVNT_NTRACE == 1) */
+
+#endif /* RATEGEN_SVNT_EXPORT_H */
+
+// End of auto generated file.