ChangeLogTag:Tue Jun 24 15:42:46 2003 Nanbor Wang <nanbor@cs.wustl.edu>

20 files changed, 113 insertions, 137 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index f5ebd7f5bf3..5afa6f5fe81 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,31 @@
+Tue Jun 24 15:42:46 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* bin/generate_component_mpc.pl: Updated mpc file generator to
+	  take advantage of the new CIDL rules.
+
+	* examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc:
+	* examples/OEP/BasicSP/BMDevice/BMDevice.mpc:
+	* examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc:
+	* examples/OEP/BasicSP/EC/EC.mpc:
+	* examples/OEP/Display/GPS/GPS.mpc:
+	* examples/OEP/Display/NavDisplay/NavDisplay.mpc:
+	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
+	* examples/OEP/Display/RateGen/RateGen.mpc:
+	* examples/handcrafted/BasicSP/BasicSP.mpc:
+	* examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc:
+	* examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc:
+	* examples/handcrafted/Display/HUDisplay.mpc:
+	* examples/handcrafted/Display/GPS/GPS.mpc:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay.mpc:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
+	* examples/handcrafted/Display/RateGen/RateGen.mpc:
+	* examples/handcrafted/Hello/hello.mpc: Updated mpc files to take
+	  advantage of the new CIDL build rules, and to use the new
+	  ciao_servant mpc template for building servant DLLs and
+	  ciao_component mpc template for building component executor
+	  DLLs..
+
 Sun Jun 22 15:23:00 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* examples/OEP/BasicSP/EC/EC.mpc:
diff --git a/TAO/CIAO/bin/generate_component_mpc.pl b/TAO/CIAO/bin/generate_component_mpc.pl
index be6e7b25cff..2587ad50151 100755
--- a/TAO/CIAO/bin/generate_component_mpc.pl
+++ b/TAO/CIAO/bin/generate_component_mpc.pl
@@ -88,7 +88,7 @@ if (defined $opt_i) {
 if (! defined $opt_n) {
     $component_def =
 '
-project('."$com_name".'_exec) : ciao_server {
+project('."$com_name".'_exec) : ciao_component {
   depends   += '."$com_name".'_svnt
   sharedname = '."$com_name".'_exec
   libs      += '."$com_name".'_stub '."$com_name".'_svnt'." $lib_depend
@@ -126,7 +126,7 @@ project('."$com_name".'_stub): ciao_client {'."
   }
 }
 
-project('."$com_name".'_svnt) : ciao_server {
+project('."$com_name".'_svnt) : ciao_servant {
   depends += '."$svnt_depend $com_name".'_stub
   sharedname  = '."$com_name".'_svnt
   libs    += '."$com_name".'_stub'." $lib_depend
@@ -134,6 +134,10 @@ project('."$com_name".'_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,export_include='."$com_name".'_svnt_export.h
   dllflags = '."$UCOM_NAME".'_SVNT_BUILD_DLL
 
+  CIDL_Files {
+    '."$com_name".'.cidl
+  }
+
   IDL_Files {
     '."$com_name".'E.idl
   }
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
index 6cd297d3c70..98b463d5cba 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
@@ -17,7 +17,7 @@ project(BMClosedED_stub): ciao_client {
   }
 }
 
-project(BMClosedED_svnt) : ciao_server {
+project(BMClosedED_svnt) : ciao_servant {
   depends += BasicSP_svnt BMClosedED_stub
   sharedname  = BMClosedED_svnt
   libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt
@@ -25,19 +25,6 @@ project(BMClosedED_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h
   dllflags = BMCLOSEDED_SVNT_BUILD_DLL
 
-  Source_Files {
-    BMClosedEDEC.cpp
-    BMClosedEDS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     BMClosedED.cidl
   }
@@ -47,12 +34,14 @@ project(BMClosedED_svnt) : ciao_server {
   }
 
   Source_Files {
+    BMClosedEDEC.cpp
+    BMClosedEDS.cpp
     BMClosedED_svnt.cpp
   }
 }
 
 
-project(BMClosedED_exec) : ciao_server {
+project(BMClosedED_exec) : ciao_component {
   depends   += BMClosedED_svnt
   sharedname = BMClosedED_exec
   libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
index 1424b569258..83530e093cd 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
@@ -18,7 +18,7 @@ project(BMDevice_stub): ciao_client {
   }
 }
 
-project(BMDevice_svnt) : ciao_server {
+project(BMDevice_svnt) : ciao_servant {
   depends += BMDevice_stub BasicSP_stub
   sharedname  = BMDevice_svnt
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
@@ -26,19 +26,6 @@ project(BMDevice_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h
   dllflags = BMDEVICE_SVNT_BUILD_DLL
 
-  Source_Files {
-    BMDeviceEC.cpp
-    BMDeviceS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     BMDevice.cidl
   }
@@ -48,12 +35,14 @@ project(BMDevice_svnt) : ciao_server {
   }
 
   Source_Files {
+    BMDeviceEC.cpp
+    BMDeviceS.cpp
     BMDevice_svnt.cpp
   }
 }
 
 
-project(BMDevice_exec) : ciao_server {
+project(BMDevice_exec) : ciao_component {
   depends   += BMDevice_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
index 1b780bf673d..5ba78a1c5a9 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
@@ -16,7 +16,7 @@ project(BMDisplay_stub): ciao_client {
   }
 }
 
-project(BMDisplay_svnt) : ciao_server {
+project(BMDisplay_svnt) : ciao_servant {
   depends += BasicSP_svnt BMDisplay_stub
   sharedname  = BMDisplay_svnt
   libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt
@@ -24,19 +24,6 @@ project(BMDisplay_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export -Wb,export_include=BMDisplay_svnt_export.h
   dllflags = BMDISPLAY_SVNT_BUILD_DLL
 
-  Source_Files {
-    BMDisplayEC.cpp
-    BMDisplayS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     BMDisplay.cidl
   }
@@ -46,12 +33,14 @@ project(BMDisplay_svnt) : ciao_server {
   }
 
   Source_Files {
+    BMDisplayEC.cpp
+    BMDisplayS.cpp
     BMDisplay_svnt.cpp
   }
 }
 
 
-project(BMDisplay_exec) : ciao_server {
+project(BMDisplay_exec) : ciao_component {
   depends   += BMDisplay_svnt
   sharedname = BMDisplay_exec
   libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
index 1aa902f0172..4e04ee473f5 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
@@ -16,7 +16,7 @@ project(EC_stub): ciao_client {
   }
 }
 
-project(EC_svnt) : ciao_server {
+project(EC_svnt) : ciao_servant {
   depends += BasicSP_svnt EC_stub
   sharedname  = EC_svnt
   libs    += EC_stub BasicSP_stub BasicSP_svnt TAO_Valuetype
@@ -24,19 +24,6 @@ project(EC_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h
   dllflags = EC_SVNT_BUILD_DLL
 
-  Source_Files {
-    ECEC.cpp
-    ECS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     EC.cidl
   }
@@ -46,12 +33,14 @@ project(EC_svnt) : ciao_server {
   }
 
   Source_Files {
+    ECEC.cpp
+    ECS.cpp
     EC_svnt.cpp
   }
 }
 
 
-project(EC_exec) : ciao_server {
+project(EC_exec) : ciao_component {
   depends   += EC_svnt
   sharedname = EC_exec
   libs      += EC_stub BasicSP_stub EC_svnt
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
index 3b916ccb9aa..b925fd1fbd0 100644
--- a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
@@ -17,7 +17,7 @@ project(GPS_stub): ciao_client {
   }
 }
 
-project(GPS_svnt) : ciao_server {
+project(GPS_svnt) : ciao_servant {
   depends += HUDisplay_svnt GPS_stub
   sharedname  = GPS_svnt
   libs    += GPS_stub HUDisplay_stub HUDisplay_svnt
@@ -25,19 +25,6 @@ project(GPS_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
   dllflags = GPS_SVNT_BUILD_DLL
 
-  Source_Files {
-    GPSEC.cpp
-    GPSS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     GPS.cidl
   }
@@ -47,12 +34,14 @@ project(GPS_svnt) : ciao_server {
   }
 
   Source_Files {
+    GPSEC.cpp
+    GPSS.cpp
     GPS_svnt.cpp
   }
 }
 
 
-project(GPS_exec) : ciao_server {
+project(GPS_exec) : ciao_component {
   depends   += GPS_svnt
   sharedname = GPS_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
@@ -70,7 +59,7 @@ project(GPS_exec) : ciao_server {
   }
 }
 
-project(GPS_tracing_exec) : ciao_server {
+project(GPS_tracing_exec) : ciao_component {
   depends   += GPS_svnt
   sharedname = GPS_tracing_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
index 8b9329071ed..e194985a2fb 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
@@ -16,7 +16,7 @@ project(NavDisplay_stub): ciao_client {
   }
 }
 
-project(NavDisplay_svnt) : ciao_server {
+project(NavDisplay_svnt) : ciao_servant {
   depends += HUDisplay_svnt NavDisplay_stub
   sharedname  = NavDisplay_svnt
   libs    += NavDisplay_stub HUDisplay_stub HUDisplay_svnt
@@ -24,19 +24,6 @@ project(NavDisplay_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
   dllflags = NAVDISPLAY_SVNT_BUILD_DLL
 
-  Source_Files {
-    NavDisplayEC.cpp
-    NavDisplayS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     NavDisplay.cidl
   }
@@ -46,12 +33,14 @@ project(NavDisplay_svnt) : ciao_server {
   }
 
   Source_Files {
+    NavDisplayEC.cpp
+    NavDisplayS.cpp
     NavDisplay_svnt.cpp
   }
 }
 
 
-project(NavDisplay_exec) : ciao_server {
+project(NavDisplay_exec) : ciao_component {
   depends   += NavDisplay_svnt
   sharedname = NavDisplay_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 1e75343f21b..b3caa4b62e0 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_exec) : ciao_server, qt_moc {
+project(NavDisplayGUI_exec) : ciao_component, qt_moc {
   depends   += NavDisplay_exec
   sharedname = NavDisplayGUI_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
index fa97f8b9cb4..c9aec0f7d78 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
@@ -16,7 +16,7 @@ project(RateGen_stub): ciao_client {
   }
 }
 
-project(RateGen_svnt) : ciao_server {
+project(RateGen_svnt) : ciao_servant {
   depends += HUDisplay_svnt RateGen_stub
   sharedname  = RateGen_svnt
   libs    += RateGen_stub HUDisplay_stub HUDisplay_svnt TAO_Valuetype
@@ -24,19 +24,6 @@ project(RateGen_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
   dllflags = RATEGEN_SVNT_BUILD_DLL
 
-  Source_Files {
-    RateGenEC.cpp
-    RateGenS.cpp
-  }
-
-  Define_Custom(CIDL) {
-    automatic = 1
-    command = ..\..\..\..\bin\cidlc --lem-file-suffix "E.idl" --
-    inputext    = cidl
-    source_outputext = _svnt.cpp
-    generic_outputext = E.idl
-  }
-
   CIDL_Files {
     RateGen.cidl
   }
@@ -46,12 +33,14 @@ project(RateGen_svnt) : ciao_server {
   }
 
   Source_Files {
+    RateGenEC.cpp
+    RateGenS.cpp
     RateGen_svnt.cpp
   }
 }
 
 
-project(RateGen_exec) : ciao_server {
+project(RateGen_exec) : ciao_component {
   depends   += RateGen_svnt
   sharedname = RateGen_exec
   libs      += RateGen_stub HUDisplay_stub RateGen_svnt
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc
index 1cc925cd2b3..333aa082f6a 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMClosedED/BMClosedED.mpc
@@ -17,7 +17,7 @@ project(BMClosedED_stub): ciao_client {
   }
 }
 
-project(BMClosedED_svnt) : ciao_server {
+project(BMClosedED_svnt) : ciao_servant {
   depends += BasicSP_svnt BMClosedED_stub
   sharedname  = BMClosedED_svnt
   libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt
@@ -25,6 +25,10 @@ project(BMClosedED_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h
   dllflags = BMCLOSEDED_SVNT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     BMClosedEDE.idl
   }
@@ -37,7 +41,7 @@ project(BMClosedED_svnt) : ciao_server {
 }
 
 
-project(BMClosedED_exec) : ciao_server {
+project(BMClosedED_exec) : ciao_component {
   depends   += BMClosedED_svnt
   sharedname = BMClosedED_exec
   libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt
@@ -54,4 +58,3 @@ project(BMClosedED_exec) : ciao_server {
     BMClosedED_exec.cpp
   }
 }
-
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
index 8ad523aa469..4e56fa1735a 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
@@ -18,7 +18,7 @@ project(BMDevice_stub): ciao_client {
   }
 }
 
-project(BMDevice_svnt) : ciao_server {
+project(BMDevice_svnt) : ciao_servant {
   depends += BMDevice_stub BasicSP_stub
   sharedname  = BMDevice_svnt
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
@@ -26,6 +26,10 @@ project(BMDevice_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h
   dllflags = BMDEVICE_SVNT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     BMDeviceE.idl
   }
@@ -38,7 +42,7 @@ project(BMDevice_svnt) : ciao_server {
 }
 
 
-project(BMDevice_exec) : ciao_server {
+project(BMDevice_exec) : ciao_component {
   depends   += BMDevice_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc
index 86102b6bdf4..1f5c2fb83f8 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDisplay/BMDisplay.mpc
@@ -16,7 +16,7 @@ project(BMDisplay_stub): ciao_client {
   }
 }
 
-project(BMDisplay_svnt) : ciao_server {
+project(BMDisplay_svnt) : ciao_servant {
   depends += BasicSP_svnt BMDisplay_stub
   sharedname  = BMDisplay_svnt
   libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt
@@ -24,6 +24,10 @@ project(BMDisplay_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export -Wb,export_include=BMDisplay_svnt_export.h
   dllflags = BMDISPLAY_SVNT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     BMDisplayE.idl
   }
@@ -36,7 +40,7 @@ project(BMDisplay_svnt) : ciao_server {
 }
 
 
-project(BMDisplay_exec) : ciao_server {
+project(BMDisplay_exec) : ciao_component {
   depends   += BMDisplay_svnt
   sharedname = BMDisplay_exec
   libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt
@@ -53,6 +57,3 @@ project(BMDisplay_exec) : ciao_server {
     BMDisplay_exec.cpp
   }
 }
-
-
-
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
index f9cb71dc1e5..140a63e401c 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
@@ -16,7 +16,7 @@ project(BasicSP_stub): ciao_client {
   }
 }
 
-project(BasicSP_svnt) : ciao_server {
+project(BasicSP_svnt) : ciao_servant {
   depends +=  BasicSP_stub
   sharedname = BasicSP_svnt
   libs    += BasicSP_stub
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
index 43d6dd6d847..0a59c4cb021 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
@@ -17,7 +17,7 @@ project(GPS_stub): ciao_client {
   }
 }
 
-project(GPS_svnt) : ciao_server {
+project(GPS_svnt) : ciao_servant {
   depends += HUDisplay_svnt GPS_stub
   sharedname  = GPS_svnt
   libs    += GPS_stub HUDisplay_stub HUDisplay_svnt
@@ -25,6 +25,10 @@ project(GPS_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
   dllflags = GPS_SVNT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     GPSE.idl
   }
@@ -37,7 +41,7 @@ project(GPS_svnt) : ciao_server {
 }
 
 
-project(GPS_exec) : ciao_server {
+project(GPS_exec) : ciao_component {
   depends   += GPS_svnt
   sharedname = GPS_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
@@ -55,7 +59,7 @@ project(GPS_exec) : ciao_server {
   }
 }
 
-project(GPS_tracing_exec) : ciao_server {
+project(GPS_tracing_exec) : ciao_component {
   depends   += GPS_svnt
   sharedname = GPS_tracing_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
index b1d448a57ef..c4b896ee1a8 100644
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.mpc
@@ -16,7 +16,7 @@ project(HUDisplay_stub): ciao_client {
   }
 }
 
-project(HUDisplay_svnt) : ciao_server {
+project(HUDisplay_svnt) : ciao_servant {
   depends +=  HUDisplay_stub
   sharedname  = HUDisplay_svnt
   libs    += HUDisplay_stub
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
index a538a173ca2..11e3f540ee8 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
@@ -16,7 +16,7 @@ project(NavDisplay_stub): ciao_client {
   }
 }
 
-project(NavDisplay_svnt) : ciao_server {
+project(NavDisplay_svnt) : ciao_servant {
   depends += HUDisplay_svnt NavDisplay_stub
   sharedname  = NavDisplay_svnt
   libs    += NavDisplay_stub HUDisplay_stub HUDisplay_svnt
@@ -24,6 +24,10 @@ project(NavDisplay_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
   dllflags = NAVDISPLAY_SVNT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     NavDisplayE.idl
   }
@@ -36,7 +40,7 @@ project(NavDisplay_svnt) : ciao_server {
 }
 
 
-project(NavDisplay_exec) : ciao_server {
+project(NavDisplay_exec) : ciao_component {
   depends   += NavDisplay_svnt
   sharedname = NavDisplay_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
@@ -53,6 +57,3 @@ project(NavDisplay_exec) : ciao_server {
     NavDisplay_exec.cpp
   }
 }
-
-
-
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 1e75343f21b..b3caa4b62e0 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_exec) : ciao_server, qt_moc {
+project(NavDisplayGUI_exec) : ciao_component, qt_moc {
   depends   += NavDisplay_exec
   sharedname = NavDisplayGUI_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
index f2fa898c8aa..8417496533d 100644
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.mpc
@@ -16,7 +16,7 @@ project(RateGen_stub): ciao_client {
   }
 }
 
-project(RateGen_svnt) : ciao_server {
+project(RateGen_svnt) : ciao_servant {
   depends += HUDisplay_svnt RateGen_stub
   sharedname  = RateGen_svnt
   libs    += RateGen_stub HUDisplay_stub HUDisplay_svnt TAO_Valuetype
@@ -24,6 +24,10 @@ project(RateGen_svnt) : ciao_server {
   idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
   dllflags = RATEGEN_SVNT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     RateGenE.idl
   }
@@ -36,11 +40,11 @@ project(RateGen_svnt) : ciao_server {
 }
 
 
-project(RateGen_exec) : ciao_server {
+project(RateGen_exec) : ciao_component {
   depends   += RateGen_svnt
   sharedname = RateGen_exec
-  libs      += RateGen_stub HUDisplay_stub RateGen_svnt 
-  libpaths += .. 
+  libs      += RateGen_stub HUDisplay_stub RateGen_svnt
+  libpaths += ..
   idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h
   dllflags   = RATEGEN_EXEC_BUILD_DLL
 
@@ -59,7 +63,7 @@ project(RateGen_exec) : ciao_server {
 project (RateGen_client) : ciao_client {
   exename = client
   depends += RateGen_stub
-  libs += RateGen_stub HUDisplay_stub TAO_Valuetype 
+  libs += RateGen_stub HUDisplay_stub TAO_Valuetype
   libpaths += .. $(TAO_ROOT)/tao/Valuetype
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc
index c3f6b9537ce..5b8774c52ed 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/hello.mpc
+++ b/TAO/CIAO/examples/handcrafted/Hello/hello.mpc
@@ -14,13 +14,17 @@ project(hello_stub): ciao_client {
   }
 }
 
-project(hello_servants) : ciao_server {
+project(hello_servants) : ciao_servant {
   depends += hello_stub
   sharedname  = hello_servants
   libs    += hello_stub
   idlflags  +=  -I ../../.. -I ../../../.. -I ../../../../orbsvcs/orbsvcs -Wb,export_macro=HELLO_SERVANT_Export -Wb,export_include=hello_servants_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
   dllflags = HELLO_SERVANT_BUILD_DLL
 
+  CIDL_Files {
+// CIDL files are not used in handcrafted examples.
+  }
+
   IDL_Files {
     helloE.idl
   }
@@ -32,7 +36,7 @@ project(hello_servants) : ciao_server {
   }
 }
 
-project(hello_executors) : ciao_server {
+project(hello_executors) : ciao_component {
   depends   += hello_servants
   sharedname = hello_executors
   libs      += hello_stub hello_servants