Sat Aug 11 17:20:15 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

98 files changed, 366 insertions, 219 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 56ccc5af88d..ae3d5019de6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,109 @@
+Sat Aug 11 17:20:15 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/AMH/Sink_Server/client.cpp:
+        * examples/AMH/Sink_Server/mt_server.cpp:
+        * examples/AMH/Sink_Server/st_server.cpp:
+        * examples/AMI/FL_Callback/peer.cpp:
+        * examples/AMI/FL_Callback/progress.cpp:
+        * examples/Advanced/ch_12/client.cpp:
+        * examples/Advanced/ch_12/server.cpp:
+        * examples/Advanced/ch_18/client.cpp:
+        * examples/Advanced/ch_18/server.cpp:
+        * examples/Advanced/ch_21/client.cpp:
+        * examples/Advanced/ch_21/server.cpp:
+        * examples/Advanced/ch_3/client.cpp:
+        * examples/Advanced/ch_3/server.cpp:
+        * examples/Advanced/ch_8_and_10/client.cpp:
+        * examples/Advanced/ch_8_and_10/server.cpp:
+        * examples/Buffered_AMI/client.cpp:
+        * examples/Buffered_AMI/server.cpp:
+        * examples/Buffered_Oneways/client.cpp:
+        * examples/Buffered_Oneways/server.cpp:
+        * examples/CSD_Strategy/ThreadPool/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool2/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool2/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool3/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool3/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool4/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool5/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool5/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool6/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool6/server_main.cpp:
+        * examples/Callback_Quoter/consumer.cpp:
+        * examples/Callback_Quoter/notifier.cpp:
+        * examples/Callback_Quoter/supplier.cpp:
+        * examples/Content_Server/AMI_Iterator/client.cpp:
+        * examples/Content_Server/AMI_Iterator/server.cpp:
+        * examples/Content_Server/AMI_Observer/client.cpp:
+        * examples/Content_Server/AMI_Observer/server.cpp:
+        * examples/Content_Server/SMI_Iterator/client.cpp:
+        * examples/Content_Server/SMI_Iterator/server.cpp:
+        * examples/Event_Comm/consumer.cpp:
+        * examples/Event_Comm/notifier.cpp:
+        * examples/Event_Comm/supplier.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/mif_example/server.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
+        * examples/Kokyu_dsrt_schedulers/muf_example/server.cpp:
+        * examples/Load_Balancing/Identity_Client.cpp:
+        * examples/Load_Balancing/Identity_Server.cpp:
+        * examples/Load_Balancing/Load_Balancing_Service.cpp:
+        * examples/Load_Balancing_persistent/Identity_Client.cpp:
+        * examples/Load_Balancing_persistent/Identity_Server.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp:
+        * examples/Logging/Logging_Service.cpp:
+        * examples/Logging/Logging_Test.cpp:
+        * examples/OBV/Typed_Events/client.cpp:
+        * examples/OBV/Typed_Events/server.cpp:
+        * examples/Persistent_Grid/client.cpp:
+        * examples/Persistent_Grid/persistent_client.cpp:
+        * examples/Persistent_Grid/server.cpp:
+        * examples/PluggableUDP/tests/Performance/client.cpp:
+        * examples/PluggableUDP/tests/Performance/server.cpp:
+        * examples/Quoter/Factory_Finder.cpp:
+        * examples/Quoter/Generic_Factory.cpp:
+        * examples/Quoter/client.cpp:
+        * examples/Quoter/server.cpp:
+        * examples/RTCORBA/Activity/Activity.cpp:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp:
+        * examples/RTScheduling/MIF_Scheduler/test.cpp:
+        * examples/RTScheduling/Starter.cpp:
+        * examples/Simple/bank/client.cpp:
+        * examples/Simple/bank/server.cpp:
+        * examples/Simple/chat/client.cpp:
+        * examples/Simple/chat/server.cpp:
+        * examples/Simple/echo/client.cpp:
+        * examples/Simple/echo/server.cpp:
+        * examples/Simple/grid/client.cpp:
+        * examples/Simple/grid/server.cpp:
+        * examples/Simple/time-date/client.cpp:
+        * examples/Simple/time-date/server.cpp:
+        * examples/Simple/time/client.cpp:
+        * examples/Simple/time/server.cpp:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
+        * examples/Simulator/Event_Supplier/Event_Con.cpp:
+        * examples/Simulator/Event_Supplier/Event_Sup.cpp:
+        * examples/Simulator/Event_Supplier/Logging_Sup.cpp:
+        * examples/mfc/client.cpp:
+
+          Use ACE_TMAIN instead of main to adhere to ACE/TAO coding guidlines.
+
+        * examples/AMH/Sink_Server/Sink_Server.mpc:
+        * examples/AMI/FL_Callback/FL_Callback.mpc:
+        * examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc:
+        * examples/Callback_Quoter/Callback_Quoter.mpc:
+        * examples/Event_Comm/Event_Comm.mpc:
+        * examples/Logging/Logging.mpc:
+        * examples/Persistent_Grid/Persistent_Grid.mpc:
+        * examples/Quoter/Quoter.mpc:
+        * examples/Simple/chat/chat.mpc:
+
+          Explicitly set exename in MPC files. This is required because MPC does
+          not recognize ACE_TMAIN as a program entry point.
+
 Sat Aug 11 11:38:47 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/Transport_Cache_Manager.h:
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 873085457c1..5e7d22fe322 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -9,6 +9,7 @@ project(*IDL) : taoidldefaults, amh {
 }
 
 project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
+  exename = st_server
   after += *IDL
   Source_Files {
     st_server.cpp
@@ -23,6 +24,7 @@ project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
 }
 
 project(*mt_server): taoexe, strategies, valuetype, amh, portableserver  {
+  exename = mt_server
   after += *IDL
   Source_Files {
     mt_server.cpp
@@ -38,6 +40,7 @@ project(*mt_server): taoexe, strategies, valuetype, amh, portableserver  {
 }
 
 project(*client): taoexe, strategies, valuetype, amh, portableserver  {
+  exename = client
   after += *IDL
   Source_Files {
     Client_Task.cpp
diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp
index 8ac228e10f5..7bba895e330 100644
--- a/TAO/examples/AMH/Sink_Server/client.cpp
+++ b/TAO/examples/AMH/Sink_Server/client.cpp
@@ -5,7 +5,7 @@
 #include "Client_Task.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Client_Task task (argc, argv);
 
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp
index be36239007c..ac0c2174eda 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp
@@ -4,7 +4,7 @@
 #include "AMH_Servant.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   MT_AMH_Server amh_server (argc, argv);
   amh_server.try_RT_scheduling();
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index 5983c3cd99f..70bcee1e46d 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -9,7 +9,7 @@ usage (const char *message)
   // @@ Mayur, what use is there in placing a space before a newline
   //    character?
   //
-  // Mayur: It makes the newline stand out 
+  // Mayur: It makes the newline stand out
 
   static const char * usage =
     "invoke as: st_server -o <ior_output_file> \n"
@@ -19,7 +19,7 @@ usage (const char *message)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Base_Server amh_server (argc, argv);
   amh_server.try_RT_scheduling();
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 9e2fa3a3042..afa8cea434f 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -9,6 +9,7 @@ project(*idl): taoexe, messaging, ami {
 }
 
 project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
+  exename = progress
   after += *idl
 
   Source_Files {
@@ -22,6 +23,7 @@ project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
 }
 
 project(*peer): taoexe, strategies, messaging, ami, portableserver {
+  exename = peer
   after += *idl
 
   Source_Files {
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 05e3a50db81..16694b6d741 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -71,7 +71,7 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index d8e6a59f4e8..2e532e43931 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -53,7 +53,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   TAO::FlResource_Loader fl_loader;
   try
diff --git a/TAO/examples/Advanced/ch_12/client.cpp b/TAO/examples/Advanced/ch_12/client.cpp
index d02bccc4c52..0dab785902d 100644
--- a/TAO/examples/Advanced/ch_12/client.cpp
+++ b/TAO/examples/Advanced/ch_12/client.cpp
@@ -136,7 +136,7 @@ set_temp (CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 }
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   CORBA::ULong i = 0;
   try
@@ -169,7 +169,7 @@ main (int argc, char * argv[])
       catch (const CORBA::SystemException &se)
         {
           std::cerr << "Cannot narrow controller reference: "
-               //<< se 
+               //<< se
                << std::endl;
           throw 0;
         }
@@ -289,8 +289,8 @@ main (int argc, char * argv[])
     }
   catch  (const CORBA::Exception & e)
     {
-      std::cerr << "Uncaught CORBA exception: " 
-                //<< e 
+      std::cerr << "Uncaught CORBA exception: "
+                //<< e
                 << std::endl;
       return 1;
     }
diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp
index a6ab71e2527..c74036b9b7e 100644
--- a/TAO/examples/Advanced/ch_12/server.cpp
+++ b/TAO/examples/Advanced/ch_12/server.cpp
@@ -622,7 +622,7 @@ preinvoke (const PortableServer::ObjectId & oid,
 }
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   CORBA::ORB_var orb;
 
diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp
index da0053bd400..1d0b8d50ecf 100644
--- a/TAO/examples/Advanced/ch_18/client.cpp
+++ b/TAO/examples/Advanced/ch_18/client.cpp
@@ -39,8 +39,8 @@ resolve_init(CORBA::ORB_ptr orb, const char * id)
     }
     catch (const CORBA::Exception & e) {
         std::cerr << "Cannot get initial reference for "
-             << id << ": " 
-             //<< e 
+             << id << ": "
+             //<< e
              << std::endl;
         throw 0;
     }
@@ -52,8 +52,8 @@ resolve_init(CORBA::ORB_ptr orb, const char * id)
     }
     catch (const CORBA::Exception & e) {
         std::cerr << "Cannot narrow reference for "
-             << id << ": " 
-             //<< e 
+             << id << ": "
+             //<< e
              << std::endl;
         throw 0;
     }
@@ -81,8 +81,8 @@ resolve_name(
         throw;
     }
     catch (const CORBA::Exception & e) {
-        std::cerr << "Cannot resolve binding: " 
-                  //<< e 
+        std::cerr << "Cannot resolve binding: "
+                  //<< e
                   << std::endl;
         throw 0;
     }
@@ -96,8 +96,8 @@ resolve_name(
         ref = T::_narrow(obj.in());
     }
     catch (const CORBA::Exception & e) {
-        std::cerr << "Cannot narrow reference: " 
-                  //<< e 
+        std::cerr << "Cannot narrow reference: "
+                  //<< e
                   << std::endl;
         throw 0;
     }
@@ -144,7 +144,7 @@ operator<<(std::ostream &os, CCS::Thermometer_ptr t)
         os << "Cannot show state for nil reference." << std::endl;
         return os;
     }
-    
+
     // Try to narrow and print what kind of device it is.
     CCS::Thermostat_var tmstat = CCS::Thermostat::_narrow(t);
     os << (CORBA::is_nil(tmstat.in()) ? "Thermometer:" : "Thermostat:")
@@ -223,7 +223,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
     CORBA::ULong i = 0;
 
@@ -282,7 +282,7 @@ main(int argc, char * argv[])
         for ( i = 0; i < list->length(); i++)
             std::cout << list[i];
         std::cout << std::endl;
-        
+
         // Change the location of first device in the list
         CCS::AssetType anum = list[0u]->asset_num();
         std::cout << "Changing location of device "
@@ -329,7 +329,7 @@ main(int argc, char * argv[])
         for ( i = 0; i < ss.length(); i++)
             std::cout << ss[i].device.in();          // Overloaded <<
         std::cout << std::endl;
-        
+
         // Increase the temperature of all thermostats
         // by 40 degrees. First, make a new list (tss)
         // containing only thermostats.
@@ -351,8 +351,8 @@ main(int argc, char * argv[])
             std::cerr << ec;                     // Overloaded <<
         }
     } catch (const CORBA::Exception & e) {
-        std::cerr << "Uncaught CORBA exception: " 
-                  //<< e 
+        std::cerr << "Uncaught CORBA exception: "
+                  //<< e
                   << std::endl;
         return 1;
     } catch (...) {
diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp
index 7bde7e98de3..67e743bcddd 100644
--- a/TAO/examples/Advanced/ch_18/server.cpp
+++ b/TAO/examples/Advanced/ch_18/server.cpp
@@ -45,8 +45,8 @@ resolve_init (CORBA::ORB_ptr orb, const char * id)
   }
   catch (const CORBA::Exception & e) {
     std::cerr << "Cannot get initial reference for "
-         << id << ": " 
-         //<< e 
+         << id << ": "
+         //<< e
          << std::endl;
     throw 0;
   }
@@ -58,8 +58,8 @@ resolve_init (CORBA::ORB_ptr orb, const char * id)
   }
   catch (const CORBA::Exception & e) {
     std::cerr << "Cannot narrow reference for "
-         << id << ": " 
-         //<< e 
+         << id << ": "
+         //<< e
          << std::endl;
     throw 0;
   }
@@ -665,7 +665,7 @@ preinvoke (
 //----------------------------------------------------------------
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
     CORBA::ORB_var orb;
 
@@ -760,8 +760,8 @@ main (int argc, char * argv[])
         orb->run ();
     }
     catch (const CORBA::Exception & e) {
-        std::cerr << "Uncaught CORBA exception: " 
-                  //<< e 
+        std::cerr << "Uncaught CORBA exception: "
+                  //<< e
                   << std::endl;
         return 1;
     }
diff --git a/TAO/examples/Advanced/ch_21/client.cpp b/TAO/examples/Advanced/ch_21/client.cpp
index 8db73588d82..0c5b00344a3 100644
--- a/TAO/examples/Advanced/ch_21/client.cpp
+++ b/TAO/examples/Advanced/ch_21/client.cpp
@@ -60,7 +60,7 @@ operator<<(std::ostream &os, CCS::Thermometer_ptr t)
         os << "Cannot show state for nil reference." << std::endl;
         return os;
     }
-    
+
     // Try to narrow and print what kind of device it is.
     CCS::Thermostat_var tmstat = CCS::Thermostat::_narrow(t);
     os << (CORBA::is_nil(tmstat.in()) ? "Thermometer:" : "Thermostat:")
@@ -139,7 +139,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
     CORBA::ULong i = 0;
     try {
@@ -166,7 +166,7 @@ main(int argc, char * argv[])
             ctrl = CCS::Controller::_narrow(obj.in());
         } catch (const CORBA::SystemException &se) {
             std::cerr << "Cannot narrow controller reference: "
-                      //<< se 
+                      //<< se
                       << std::endl;
             throw 0;
         }
@@ -201,7 +201,7 @@ main(int argc, char * argv[])
         for ( i = 0; i < list->length(); i++)
             std::cout << list[i];
         std::cout << std::endl;
-        
+
         // Change the location of first device in the list
         CCS::AssetType anum = list[0U]->asset_num();
         std::cout << "Changing location of device "
@@ -248,7 +248,7 @@ main(int argc, char * argv[])
         for ( i = 0; i < ss.length(); i++)
             std::cout << ss[i].device.in();          // Overloaded <<
         std::cout << std::endl;
-        
+
         // Increase the temperature of all thermostats
         // by 40 degrees. First, make a new list (tss)
         // containing only thermostats.
@@ -270,8 +270,8 @@ main(int argc, char * argv[])
             std::cerr << ec;                     // Overloaded <<
         }
     } catch (const CORBA::Exception & e) {
-        std::cerr << "Uncaught CORBA exception: " 
-                  //<< e 
+        std::cerr << "Uncaught CORBA exception: "
+                  //<< e
                   << std::endl;
         return 1;
     } catch (...) {
diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp
index 7bf9f78a57a..c6f72bf0346 100644
--- a/TAO/examples/Advanced/ch_21/server.cpp
+++ b/TAO/examples/Advanced/ch_21/server.cpp
@@ -596,7 +596,7 @@ preinvoke (
     const PortableServer::ObjectId & oid,
     PortableServer::POA_ptr          /* poa */ ,
     const char *                     operation,
-    void * &                         /* cookie */ 
+    void * &                         /* cookie */
 )
 {
     // Convert object id into asset number.
@@ -667,7 +667,7 @@ preinvoke (
 //----------------------------------------------------------------
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
     try {
         // Initialize orb
@@ -737,8 +737,8 @@ main (int argc, char **argv)
         orb->run ();
     }
     catch (const CORBA::Exception & e) {
-        std::cerr << "Uncaught CORBA exception: " 
-                  //<< e 
+        std::cerr << "Uncaught CORBA exception: "
+                  //<< e
                   << std::endl;
         return 1;
     }
diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp
index 49b11d92cea..779cdb903e1 100644
--- a/TAO/examples/Advanced/ch_3/client.cpp
+++ b/TAO/examples/Advanced/ch_3/client.cpp
@@ -27,7 +27,7 @@
 //#include <iostream.h>
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index 309f5c90ecd..48cdc56defc 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -48,9 +48,9 @@ get_gmt (void)
 // ______________________________________________________
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  try 
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
       // Accept requests
       orb->run ();
     }
-  catch (const CORBA::Exception &) 
+  catch (const CORBA::Exception &)
     {
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
index 607fdfdc9c4..a82b9ef5d2f 100644
--- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
+++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, portableserver {
+project(*client) : taoclient {
   requires += dummy_label
   source_files {
     client.cpp
diff --git a/TAO/examples/Advanced/ch_8_and_10/client.cpp b/TAO/examples/Advanced/ch_8_and_10/client.cpp
index 6c09361882f..5843c985ac0 100644
--- a/TAO/examples/Advanced/ch_8_and_10/client.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/client.cpp
@@ -118,55 +118,65 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
         return;
 
     CCS::AssetType anum = tmstat->asset_num();
-    try {
-		std::cout << "Setting thermostat " << anum
-			<< " to " << new_temp << " degrees." << std::endl;
-        CCS::TempType old_nominal = tmstat->set_nominal(new_temp);
-		std::cout << "Old nominal temperature was: "
-			<< old_nominal << std::endl;
-		std::cout << "New nominal temperature is: "
-			<< tmstat->get_nominal() << std::endl;
-    } catch (const CCS::Thermostat::BadTemp & bt) {
-		std::cerr << "Setting of nominal temperature failed." << std::endl;
-		std::cerr << bt.details << std::endl;             // Overloaded <<
+    try 
+    {
+      std::cout << "Setting thermostat " << anum
+                << " to " << new_temp << " degrees." << std::endl;
+      CCS::TempType old_nominal = tmstat->set_nominal(new_temp);
+      std::cout << "Old nominal temperature was: "
+                << old_nominal << std::endl;
+      std::cout << "New nominal temperature is: "
+                << tmstat->get_nominal() << std::endl;
+    } 
+    catch (const CCS::Thermostat::BadTemp & bt) 
+    {
+      std::cerr << "Setting of nominal temperature failed." << std::endl;
+      std::cerr << bt.details << std::endl;             // Overloaded <<
     }
 }
 
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-    try {
+    try 
+    {
         // Initialize the ORB
         CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
         // Check arguments
-        if (argc != 2) {
-			std::cerr << "Usage: client IOR_string" << std::endl;
+        if (argc != 2) 
+        {
+            std::cerr << "Usage: client IOR_string" << std::endl;
             throw 0;
         }
 
         // Get controller reference from argv
         // and convert to object.
         CORBA::Object_var obj = orb->string_to_object(argv[1]);
-        if (CORBA::is_nil(obj.in())) {
-			std::cerr << "Nil controller reference" << std::endl;
+        if (CORBA::is_nil(obj.in())) 
+        {
+            std::cerr << "Nil controller reference" << std::endl;
             throw 0;
         }
 
         // Try to narrow to CCS::Controller.
         CCS::Controller_var ctrl;
-        try {
+        try 
+        {
             ctrl = CCS::Controller::_narrow(obj.in());
-        } catch (const CORBA::SystemException & se) {
-			std::cerr << "Cannot narrow controller reference: "
-                 //<< se
-                 << std::endl;
+        } 
+        catch (const CORBA::SystemException & se) 
+        {
+            std::cerr << "Cannot narrow controller reference: "
+                    //<< se
+                      << std::endl;
             throw 0;
         }
-        if (CORBA::is_nil(ctrl.in())) {
-			std::cerr << "Wrong type for controller ref." << std::endl;
+        if (CORBA::is_nil(ctrl.in())) 
+        {
+            std::cerr << "Wrong type for controller ref." << std::endl;
             throw 0;
         }
 
@@ -175,10 +185,10 @@ main(int argc, char * argv[])
 
         // Show number of devices.
         CORBA::ULong len = list->length();
-		std::cout << "Controller has " << len << " device";
+        std::cout << "Controller has " << len << " device";
         if (len != 1)
-			std::cout << "s";
-		std::cout << "." << std::endl;
+          std::cout << "s";
+        std::cout << "." << std::endl;
 
         // If there are no devices at all, we are finished.
         if (len == 0)
@@ -203,18 +213,22 @@ main(int argc, char * argv[])
         CCS::Thermostat_var tmstat;
         for (   CORBA::ULong j = 0;
                 j < list->length() && CORBA::is_nil(tmstat.in());
-                j++) {
+                j++) 
+        {
             tmstat = CCS::Thermostat::_narrow(list[j]);
         }
 
         // Check that we found a thermostat on the list.
-        if (CORBA::is_nil(tmstat.in())) {
-			std::cout << "No thermostat devices in list." << std::endl;
-        } else {
+        if (CORBA::is_nil(tmstat.in())) 
+        {
+          std::cout << "No thermostat devices in list." << std::endl;
+        } 
+        else 
+        {
             // Set temperature of thermostat to
             // 50 degrees (should work).
             set_temp(tmstat.inout(), 50);
-			std::cout << std::endl;
+            std::cout << std::endl;
 
             // Set temperature of thermostat to
             // -10 degrees (should fail).
@@ -224,7 +238,7 @@ main(int argc, char * argv[])
         // Look for device in Rooms Earth and HAL. This must
         // locate at least one device because we earlier changed
         // the location of the first device to Room Earth.
-		std::cout << "Looking for devices in Earth and HAL." << std::endl;
+        std::cout << "Looking for devices in Earth and HAL." << std::endl;
         CCS::Controller::SearchSeq ss;
         ss.length(2);
         ss[0].key.loc(CORBA::string_dup("Earth"));
@@ -233,15 +247,16 @@ main(int argc, char * argv[])
 
         // Show the devices found in that room.
         for (CORBA::ULong k = 0; k < ss.length(); k++)
-			std::cout << ss[k].device.in();      // Overloaded <<
-		std::cout << std::endl;
+          std::cout << ss[k].device.in();      // Overloaded <<
+        std::cout << std::endl;
 
         // Increase the temperature of all thermostats
         // by 40 degrees. First, make a new list (tss)
         // containing only thermostats.
-		std::cout << "Increasing thermostats by 40 degrees." << std::endl;
+        std::cout << "Increasing thermostats by 40 degrees." << std::endl;
         CCS::Controller::ThermostatSeq tss;
-        for (CORBA::ULong l = 0; l < list->length(); l++) {
+        for (CORBA::ULong l = 0; l < list->length(); l++) 
+        {
             tmstat = CCS::Thermostat::_narrow(list[l]);
             if (CORBA::is_nil(tmstat.in()))
                 continue;                   // Skip thermometers
@@ -251,17 +266,24 @@ main(int argc, char * argv[])
         }
 
         // Try to change all thermostats.
-        try {
+        try 
+        {
             ctrl->change(tss, 40);
-        } catch (const CCS::Controller::EChange & ec) {
-			std::cerr << ec;                     // Overloaded <<
+        } 
+        catch (const CCS::Controller::EChange & ec) 
+        {
+          std::cerr << ec;                     // Overloaded <<
         }
-    } catch (const CORBA::Exception & e) {
-		std::cerr << "Uncaught CORBA exception: "
-             //<< e
-             << std::endl;
+    } 
+    catch (const CORBA::Exception & e) 
+    {
+        std::cerr << "Uncaught CORBA exception: "
+                //<< e
+                  << std::endl;
         return 1;
-    } catch (...) {
+    } 
+    catch (...) 
+    {
         return 1;
     }
     return 0;
diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp
index 05231d360a4..f95cc75a296 100644
--- a/TAO/examples/Advanced/ch_8_and_10/server.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp
@@ -402,7 +402,7 @@ find (CCS::Controller::SearchSeq & slist)
 //----------------------------------------------------------------
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
     try {
         // Initialize orb
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index cc914c67389..9bc9a2ce668 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -234,7 +234,7 @@ setup_buffering_constraints (CORBA::ORB_ptr orb)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
 
   try
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 7c49893a30a..13d80b781ce 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index 9a451d7e926..af8060f2195 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -114,7 +114,7 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
 
   try
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index f30643ea98a..3ed0f81c74e 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
index 2c768647052..a4c0931488c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
@@ -6,7 +6,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
index 699e7a00dbe..b3f427fb678 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
@@ -5,7 +5,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
index 41d9b635f30..0c217199a38 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
@@ -5,7 +5,7 @@
 #include "tao/Exception.h"
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
index 1fa02daa71b..7ef554f5499 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
@@ -6,7 +6,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
index 34c9ba2b3d7..5599a70d674 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
@@ -5,7 +5,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
index 6aa553483aa..70e98b7adae 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
@@ -4,7 +4,7 @@
 #include "tao/Exception.h"
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
index ae4b26425fb..961ebd01d21 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
@@ -5,7 +5,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
index 2c768647052..a4c0931488c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
@@ -6,7 +6,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
index 48b765f3ebe..5af35beb0fc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
@@ -7,7 +7,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
index 2c768647052..a4c0931488c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
@@ -6,7 +6,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
index 48b765f3ebe..5af35beb0fc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
@@ -7,7 +7,7 @@
 
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->priority_mask(LM_TRACE     |
                              LM_DEBUG     |
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 5b96007db67..d5014089066 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -10,6 +10,7 @@ project(*IDL): taoidldefaults {
 }
 
 project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro {
+  exename = notifier
   after += *IDL
   Source_Files {
     NotifierC.cpp
@@ -24,6 +25,7 @@ project(Callback_Quoter notifier): namingexe, utils, avoids_corba_e_micro {
 }
 
 project(Callback_Quoter consumer): namingexe, portableserver {
+  exename = consumer
   after += *IDL
   Source_Files {
     ConsumerC.cpp
@@ -40,6 +42,7 @@ project(Callback_Quoter consumer): namingexe, portableserver {
 }
 
 project(Callback_Quoter supplier): namingexe, portableserver {
+  exename = supplier
   after += *IDL
   Source_Files {
     ConsumerC.cpp
diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp
index 9060eb9ec1d..a9115e68ca5 100644
--- a/TAO/examples/Callback_Quoter/consumer.cpp
+++ b/TAO/examples/Callback_Quoter/consumer.cpp
@@ -5,7 +5,7 @@
 // This function runs the Callback Quoter Consumer application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Consumer_Handler consumer;
 
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index e018f1bb4de..0ad0f34bf7a 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(notifier, Callback_Quoter, "$Id$")
 // This is the main driver program for the Callback Quoter Notifier.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Notifier_Input_Handler notifier;
 
diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp
index 5d746eb0bc9..7b914093937 100644
--- a/TAO/examples/Callback_Quoter/supplier.cpp
+++ b/TAO/examples/Callback_Quoter/supplier.cpp
@@ -5,7 +5,7 @@
 // This function runs the Callback Quoter Supplier daemon.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
  Supplier supplier;
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 93b5fd0d1a0..cb2556b8e23 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -24,7 +24,7 @@ void invoke_requests (int argc,
                       Web_Server::Iterator_Factory_ptr f);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index d33f37fbf5d..0dc4dae6f81 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (AMI_Iterator,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 2a5f8204d05..f651794e266 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -24,7 +24,7 @@ void invoke_requests (int argc,
                       Web_Server::Iterator_Factory_ptr f);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index e3cc88d906e..7bf6a562b4f 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (AMI_Observer,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index e81ac7370ff..358787a07db 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -31,7 +31,7 @@ int spawn_viewer (const char *content_type,
                   const char *filename);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 14ea359f5af..1d4ac8fa72f 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (SMI_Iterator,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index 28102fc21de..ef11c776d47 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -9,6 +9,7 @@ project(*IDL): taoidldefaults {
 }
 
 project(*notifier): namingexe, utils, avoids_corba_e_micro {
+  exename = notifier
   after += *IDL
   Source_Files {
     Event_Comm_i.cpp
@@ -22,6 +23,7 @@ project(*notifier): namingexe, utils, avoids_corba_e_micro {
 }
 
 project(*consumer): namingexe, portableserver {
+  exename = consumer
   after += *IDL
   Source_Files {
     Consumer_Input_Handler.cpp
@@ -36,6 +38,7 @@ project(*consumer): namingexe, portableserver {
 }
 
 project(*supplier): namingexe, portableserver {
+  exename = supplier
   after += *IDL
   Source_Files {
     Event_Comm_i.cpp
diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp
index d05d2175ba3..8edf63fd353 100644
--- a/TAO/examples/Event_Comm/consumer.cpp
+++ b/TAO/examples/Event_Comm/consumer.cpp
@@ -92,43 +92,43 @@ Consumer::initialize (int argc, char *argv[])
   // Initialize the <Consumer_Handler>.
   if (this->ch_.init (argc, argv, this) == -1)
      ACE_ERROR_RETURN ((LM_ERROR,
-			"%p\n",
-			"Consumer_Handler failed to initialize\n"),
+                        "%p\n",
+                        "Consumer_Handler failed to initialize\n"),
                        -1);
    // Initialize the <Consumer_Input_Handler>.
   else if (this->ih_.initialize (&this->ch_) == -1)
      ACE_ERROR_RETURN ((LM_ERROR,
-			"%p\n",
-			"Consumer_Input_Handler failed to initialize\n"),
+                        "%p\n",
+                        "Consumer_Input_Handler failed to initialize\n"),
                        -1);
   else if (this->ch_.reactor ()->register_handler (SIGINT,
                                               this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "register_handler"),
+                       "%p\n",
+                       "register_handler"),
                       -1);
   else
     return 0;
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Initialize the supplier and consumer object references.
   Consumer consumer;
 
   if (consumer.initialize (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "Consumer init failed\n"),
-		      1);
+                       "%p\n",
+                       "Consumer init failed\n"),
+                      1);
 
   // Loop forever handling events.
   if (consumer.run () == -1)
-  ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "Consumer run failed\n"),
-		      1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "Consumer run failed\n"),
+                      1);
 
   return 0;
 }
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index 774eea4db30..a4c038cc699 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -56,7 +56,7 @@ Notifier::~Notifier (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Initialize server daemon.
   Notifier notifier (argc, argv);
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index c44b6123b8d..9cfa5f01f31 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -47,19 +47,18 @@ Supplier::init (int argc, char *argv[])
 {
   if (this->nh_.init (argc, argv, this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "Notifier_Handler did not init\n"),
+                       "%p\n",
+                       "Notifier_Handler did not init\n"),
                       -1);
   else if (this->ih_.initialize (&nh_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "Supplier Input handler did not init\n"),
+                       "%p\n",
+                       "Supplier Input handler did not init\n"),
                       -1);
-  else if (nh_.reactor ()->register_handler (SIGINT,
-                                                       this) == -1)
+  else if (nh_.reactor ()->register_handler (SIGINT, this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "register_handler"),
+                       "%p\n",
+                       "register_handler"),
                       -1);
   ACE_DEBUG ((LM_DEBUG,
               "Supplier initialized.. \n"));
@@ -67,7 +66,7 @@ Supplier::init (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Initialize server daemon.
   Supplier supplier;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index c49ac65f6de..e20b98cfa08 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -95,7 +95,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Fixed_Priority_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index b583b30cb5e..bc448b03e26 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -80,7 +80,7 @@ private:
 Task_Stats task_stats;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Fixed_Priority_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 176cfae2f86..68089547cd6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -95,7 +95,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   MIF_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 90210fb78e1..f2124e43104 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -80,7 +80,7 @@ private:
 Task_Stats task_stats;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   MIF_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 7d14239c38e..33ba08022f4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -100,7 +100,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   MUF_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index 18dfb3831c6..6ad6bf7274c 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -80,7 +80,7 @@ private:
 Task_Stats task_stats;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   MUF_Scheduler* scheduler = 0;
   RTScheduling::Current_var current;
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 4408b158fc6..3e8aa343755 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -187,7 +187,7 @@ Identity_Client::~Identity_Client (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   Identity_Client client;
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index 1605a12551c..fe5a98e8bb1 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -186,7 +186,7 @@ Identity_Server::~Identity_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   Identity_Server server;
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index 91581c92f95..9add0759c68 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -129,7 +129,7 @@ Load_Balancing_Service::~Load_Balancing_Service (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   Load_Balancing_Service factory;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 9ead6d3e69a..3393ba1bd1f 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -225,7 +225,7 @@ Identity_Client::~Identity_Client (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   Identity_Client client;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index d95c042c6ce..d402de58b46 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -148,22 +148,22 @@ Identity_Server::register_groups (void)
   // We want to make two groups Random & Round Robin.
   Load_Balancer::Object_Group_var random_group =
     factory->make_random ("Random group");
-  
+
   if (CORBA::is_nil (random_group.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Got nil random group from load balancer\n"));
       return -1;
     }
-  
+
   Load_Balancer::Object_Group_var rr_group =
     factory->make_round_robin ("Round Robin group");
-  
+
   if (CORBA::is_nil (rr_group.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Got nil round robin group from load balancer\n"));
       return -1;
     }
-  
+
   // Create the requested number of <Identity> objects, and
   // register them with the random and round robin
   // <Object_Group>s.
@@ -239,7 +239,7 @@ Identity_Server::~Identity_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   Identity_Server server;
@@ -254,10 +254,10 @@ main (int argc, char *argv[])
   try
     {
       result = server.register_groups ();
-      
+
       if (result != 0)
         return 1;
-      
+
       result = server.run ();
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index 754cee0f1ae..33c85641eb7 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -158,7 +158,7 @@ Load_Balancing_Service::~Load_Balancing_Service (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   Load_Balancing_Service factory;
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 481a22e5c21..b6ab1cd9e13 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -9,6 +9,7 @@ project(*IDL): taoidldefaults {
 }
 
 project(*Service): namingexe, utils, avoids_corba_e_micro {
+  exename = Logging_Service
   after += *IDL
   Source_Files {
     Logger_i.cpp
@@ -22,6 +23,7 @@ project(*Service): namingexe, utils, avoids_corba_e_micro {
 }
 
 project(*Test): namingexe, utils {
+  exename = Logging_Test
   after += *IDL
   Source_Files {
     Logging_Test.cpp
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index 9b696ae503d..5481f7e8500 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -6,7 +6,7 @@
 ACE_RCSID(Logging_Service, Logging_Service, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Set TAO_debug_level to 0 to ensure silent running unless
   // debugging is explicitly invoked
diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp
index f309e54d9e6..535e3903b51 100644
--- a/TAO/examples/Logging/Logging_Test.cpp
+++ b/TAO/examples/Logging/Logging_Test.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(Logger, Logging_Test, "$Id$")
 // This function runs the Logging service test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Logger_Client logger_client;
 
diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
index d4e502a26bd..5eb9280095a 100644
--- a/TAO/examples/OBV/Typed_Events/client.cpp
+++ b/TAO/examples/OBV/Typed_Events/client.cpp
@@ -5,7 +5,7 @@
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Checkpoint_Client_i client;
 
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 02ed9d0ec12..78ee37613d7 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -5,7 +5,7 @@
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Server<Checkpoint_i> server;
 
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 3905b5e4b51..29c7283f87a 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -22,6 +22,7 @@ project(*server): taoserver, utils, avoids_corba_e_micro, avoids_ace_for_tao {
 }
 
 project(*client): taoexe, utils, portableserver {
+  exename = client
   after += *IDL
   Source_Files {
     GridC.cpp
@@ -34,6 +35,7 @@ project(*client): taoexe, utils, portableserver {
 }
 
 project(*persistent client): taoexe, utils, portableserver {
+  exename = persistent_client
   after += *IDL
   Source_Files {
     GridC.cpp
diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp
index c67b7b80261..479b8a8cf98 100644
--- a/TAO/examples/Persistent_Grid/client.cpp
+++ b/TAO/examples/Persistent_Grid/client.cpp
@@ -5,18 +5,18 @@
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Grid_Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
-  
+
   if (client.run ("Grid", argc, argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
-   
+
 }
 
-                                 
+
diff --git a/TAO/examples/Persistent_Grid/persistent_client.cpp b/TAO/examples/Persistent_Grid/persistent_client.cpp
index 3bd9a3137e6..4e6c7791336 100644
--- a/TAO/examples/Persistent_Grid/persistent_client.cpp
+++ b/TAO/examples/Persistent_Grid/persistent_client.cpp
@@ -5,18 +5,18 @@
 // The "persistent client" program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Persistent_Client_i client;
-  
+
 
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
 
   if (client.run ("grid", argc, argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
 }
 
-                                 
+
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index e0ce288d564..5b830ac001c 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -6,7 +6,7 @@
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Server<Grid_Factory_i> server;
 
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index 2e46d644b40..57c17567a79 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -66,7 +66,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index 53dfbbf53f8..ea5267cebea 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -76,7 +76,7 @@ static ACE_THR_FUNC_RETURN svc (void *arg)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index 0b22ea6e067..daf0ca5d41c 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -201,7 +201,7 @@ Quoter_Factory_Finder_Server::parse_args (void)
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Quoter_Factory_Finder_Server quoter_Factory_Finder_Server;
 
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 4e9b26a0269..2ff1f5dedbc 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -253,7 +253,7 @@ Quoter_Generic_Factory_Server::parse_args (void)
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Quoter_Generic_Factory_Server quoter_Generic_Factory_Server;
 
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index a3571740a13..7e98dc5d5c4 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -9,6 +9,7 @@ project(*IDL): taoidldefaults {
 }
 
 project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corba_e_micro {
+  exename = server
   after += *IDL
   Source_Files {
     QuoterC.cpp
@@ -21,6 +22,7 @@ project(*server): namingexe, lifecycle, avoids_minimum_corba, utils, avoids_corb
 }
 
 project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  exename = client
   after += *IDL
   Source_Files {
     QuoterC.cpp
@@ -31,6 +33,7 @@ project(*client): namingexe, lifecycle, avoids_minimum_corba, avoids_corba_e_com
 }
 
 project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils {
+  exename = Factory_Finder
   after += *IDL
   Source_Files {
     QuoterC.cpp
@@ -43,6 +46,7 @@ project(*Factory Finder): namingexe, lifecycle, avoids_minimum_corba, utils {
 }
 
 project(*Generic Factory): namingexe, lifecycle, avoids_minimum_corba, utils {
+  exename = Generic_Factory
   after += *IDL
   Source_Files {
     QuoterC.cpp
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index c5cf32579d3..447cb119f81 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -350,7 +350,7 @@ Quoter_Client::init (int argc, char **argv)
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_Thread_Manager thr_mgr;
 
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index c9c1e4944a9..023ddef04a3 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -236,7 +236,7 @@ Quoter_Server::~Quoter_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Quoter_Server quoter_server;
 
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index a788379e7b5..41097945640 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -374,7 +374,7 @@ Activity::create_started_flag_file (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder);
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index c629a336669..c16cab75ee1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -233,7 +233,7 @@ DT_Test::orb (void)
 }
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index 481540e1c45..9be11e627f8 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -131,7 +131,7 @@ DT_Test::current (void)
 }
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 88296f3b815..b227a7970a4 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -119,7 +119,7 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list)
 
 
 int
-main (int argc, char** argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp
index 0f426992f06..80bac229fe8 100644
--- a/TAO/examples/Simple/bank/client.cpp
+++ b/TAO/examples/Simple/bank/client.cpp
@@ -5,19 +5,19 @@
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Bank_Client_i client;
-  
+
 
   ACE_DEBUG ((LM_DEBUG,
               "\nBank client\n\n"));
 
   if (client.run ("Bank",argc, argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
-   
+
 }
 
-                                 
+
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index 2b6f62e3624..48391dd6a60 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -5,7 +5,7 @@
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Server<AccountManager_i> server;
 
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index d8649da64d4..074729eee76 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -24,6 +24,7 @@ project(*server) : taoserver, utils, iortable {
 }
 
 project(*client): taoexe, portableserver, utils {
+  exename = client
   after += *IDL
   IDL_Files {
   }
diff --git a/TAO/examples/Simple/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp
index 9cf87f0b0f7..ac5f05ed147 100644
--- a/TAO/examples/Simple/chat/client.cpp
+++ b/TAO/examples/Simple/chat/client.cpp
@@ -19,7 +19,7 @@
 #include "Client_i.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp
index f459c40a8df..cfc742e5c9f 100644
--- a/TAO/examples/Simple/chat/server.cpp
+++ b/TAO/examples/Simple/chat/server.cpp
@@ -20,7 +20,7 @@
 #include "Server_i.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
 
   try
diff --git a/TAO/examples/Simple/echo/client.cpp b/TAO/examples/Simple/echo/client.cpp
index f2aa863069b..8b639076371 100644
--- a/TAO/examples/Simple/echo/client.cpp
+++ b/TAO/examples/Simple/echo/client.cpp
@@ -5,21 +5,21 @@
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Echo_Client_i client;
-  
+
 
   ACE_DEBUG ((LM_DEBUG,
               "\nEcho client\n\n"));
 
   if (client.run ("Echo",
-                  argc, 
+                  argc,
                   argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
-   
+
 }
 
-                                 
+
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index 9755513ceab..a3bea500c57 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -5,7 +5,7 @@
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Server<Echo_i> server;
 
diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp
index 4bec0e49dad..9e9c02100f0 100644
--- a/TAO/examples/Simple/grid/client.cpp
+++ b/TAO/examples/Simple/grid/client.cpp
@@ -5,19 +5,19 @@
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Grid_Client_i client;
-  
+
 
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
 
   if (client.run ("Grid", argc, argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
-   
+
 }
 
-                                 
+
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index 4f290727fcb..1f7aabc9f1d 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -5,7 +5,7 @@
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Server<Grid_Factory_i> server;
 
diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp
index 452afbec7fa..3f8574ebe53 100644
--- a/TAO/examples/Simple/time-date/client.cpp
+++ b/TAO/examples/Simple/time-date/client.cpp
@@ -5,7 +5,7 @@
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Time_Date_Client_i client;
 
@@ -13,7 +13,7 @@ main (int argc, char *argv[])
               "\nTime_Date client\n\n"));
 
   if (client.run ("Time_Date", argc, argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
 }
diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp
index f9ddbadc4bb..97e303796f5 100644
--- a/TAO/examples/Simple/time-date/server.cpp
+++ b/TAO/examples/Simple/time-date/server.cpp
@@ -27,7 +27,7 @@ ACE_RCSID (time_date,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   if (ACE_Service_Config::open (argc, argv) == -1
       && errno != ENOENT)
diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp
index 28eab3cb977..e1b2bc357ed 100644
--- a/TAO/examples/Simple/time/client.cpp
+++ b/TAO/examples/Simple/time/client.cpp
@@ -5,19 +5,19 @@
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Time_Client_i client;
-  
+
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and date client\n\n"));
 
   if (client.run ("Time",argc, argv) == -1)
-    return -1; 
+    return -1;
   else
     return 0;
-   
+
 }
 
-                                 
+
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 0f5a862156a..dd7f0a6819e 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -5,7 +5,7 @@
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   Server<Time_i> server;
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 5045413166d..2fab665ddac 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -1024,7 +1024,7 @@ DualEC_Supplier::get_options (int argc, char *argv [])
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   int min_priority =
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 3f25d180b64..de0047e8944 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -263,7 +263,7 @@ get_options (int argc, char *argv [])
 // function main.
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 55c10813eec..db499b65f86 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -441,7 +441,7 @@ Event_Supplier::get_options (int argc, char *argv [])
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 0583edf6504..40f827db5df 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -495,7 +495,7 @@ Logging_Supplier::get_options (int argc, char *argv [])
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 5d7fdacb675..cf9b8effdbc 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -5,7 +5,7 @@
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {