Mon Apr 17 18:04:56 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>

19 files changed, 43 insertions, 19 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index ede854e562f..ea4231c9b4d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,27 @@
+Mon Apr 17 18:04:56 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * M docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+        * examples/BasicSP/BasicSP.mpc
+        * examples/BasicSP/BMClosedED/BMClosedED.mpc
+        * examples/BasicSP/BMDevice/BMDevice.mpc
+        * examples/BasicSP/BMDisplay/BMDisplay.mpc
+        * examples/BasicSP/EC/EC.mpc
+        * examples/Display/HUDisplay.mpc
+        * examples/Display/GPS/GPS.mpc
+        * examples/Display/NavDisplay/NavDisplay.mpc
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+        * examples/Display/RateGen/RateGen.mpc
+        * examples/Hello/Hello_Base/Hello_Base.mpc
+        * examples/Hello/Receiver/Receiver.mpc
+        * examples/Hello/Sender/Sender.mpc
+        * examples/Swapping/Hello_Base/Hello_Base.mpc
+        * examples/Swapping/Receiver/Receiver.mpc
+        * examples/Swapping/Sender/Sender.mpc
+        * tools/Config_Handlers/Config_Handlers.mpc
+        
+          Linking fixes for OS X.
+        
+
 Mon Apr 17 02:33:44 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
 
         * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc:
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index 295c8d0004c..73fd7a94ffe 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Stock_Base Distributor"
 
-project(Stock_Base_Distributor_stub): ciao_client_dnc {
+project(Stock_Base_Distributor_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Distributor_stub
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index d08061594a0..7eaa7d913a4 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i BMClosedED"
 // This file has been manually modified to add a second component implementation.
 
-project(BMClosedED_DnC_stub): ciao_client_dnc {
+project(BMClosedED_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index 90212cc63ec..762fb25c8e8 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(BMDevice_DnC_stub): ciao_client_dnc {
+project(BMDevice_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMDevice_stub
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 35e0c3196f0..740c50abf8e 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay"
 
-project(BMDisplay_DnC_stub): ciao_client_dnc {
+project(BMDisplay_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
diff --git a/TAO/CIAO/examples/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/BasicSP/BasicSP.mpc
index b0b9999b3d2..fd1151988cf 100644
--- a/TAO/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/TAO/CIAO/examples/BasicSP/BasicSP.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(BasicSP_DnC_stub): ciao_component_dnc {
+project(BasicSP_DnC_stub): ciao_events_base_dnc {
 
   sharedname = BasicSP_stub
   idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index 6c318154655..d425aad92e3 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC"
 
-project(EC_DnC_stub): ciao_client_dnc {
+project(EC_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
@@ -97,7 +97,7 @@ project (EC_DnC_client) : ciao_client_dnc, valuetype {
 }
 
 
-project (EC_DnC_controller) : ciao_client_dnc, valuetype {
+project (EC_DnC_controller) : ciao_events_dnc, valuetype {
   avoids += ace_for_tao
   exename = controller
   after += EC_DnC_stub
diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index 179370dc95b..b72c8b64f97 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p HUDisplay GPS"
 
-project(GPS_DnC_stub): ciao_client_dnc {
+project(GPS_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = GPS_DnC_stub
diff --git a/TAO/CIAO/examples/Display/HUDisplay.mpc b/TAO/CIAO/examples/Display/HUDisplay.mpc
index a7391f6792a..41e3dbc1ab1 100644
--- a/TAO/CIAO/examples/Display/HUDisplay.mpc
+++ b/TAO/CIAO/examples/Display/HUDisplay.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(HUDisplay_DnC_stub): ciao_component_dnc {
+project(HUDisplay_DnC_stub): ciao_events_base_dnc {
 
   sharedname = HUDisplay_DnC_stub
   idlflags += -Wb,stub_export_macro=HUDISPLAY_STUB_Export -Wb,stub_export_include=HUDisplay_stub_export.h -Wb,skel_export_macro=HUDISPLAY_SVNT_Export -Wb,skel_export_include=HUDisplay_svnt_export.h
diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 667c96250b8..3addb40ebee 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p HUDisplay NavDisplay"
 
-project(NavDisplay_DnC_stub): ciao_client_dnc {
+project(NavDisplay_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = NavDisplay_DnC_stub
diff --git a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 7a5a4e78902..5c12e09bb09 100644
--- a/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_DnC_exec) : ciao_component_dnc, qt {
+project(NavDisplayGUI_DnC_exec) : ciao_events_base_dnc, qt {
   after   += NavDisplay_DnC_exec
   requires += qt
   sharedname = NavDisplayGUI_DnC_exec
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
index 5cdab590983..e0cd424393e 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p HUDisplay RateGen"
 
-project(RateGen_DnC_stub): ciao_client_dnc {
+project(RateGen_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = RateGen_DnC_stub
diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index c42d1c0358c..e637d031bd9 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_DnC_stub): ciao_component_dnc {
+project(Hello_Base_DnC_stub): ciao_events_base_dnc {
 
   sharedname = Hello_Base_DnC_stub
   idlflags += -Sc \
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index df794278191..abde96ca404 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
+project(Hello_Base_Receiver_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Receiver_DnC_stub
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 0b4473033c8..1363b6c0e71 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
+project(Hello_Base_Sender_DnC_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Sender_DnC_stub
diff --git a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
index 5b908c14f1b..ba9357c2fd8 100644
--- a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_DnC_Upgradeable_stub): ciao_component_dnc {
+project(Hello_Base_DnC_Upgradeable_stub): ciao_events_base_dnc {
 
   sharedname = Hello_Base_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
index b6b13c0660b..3a587791546 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
+project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_stub
   sharedname = Receiver_DnC_Upgradeable_stub
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
index d0d42c7c8bc..f2490ad5976 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(HelloB_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
+project(HelloB_Sender_DnC_Upgradeable_stub): ciao_events_base_dnc {
   avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_stub
   sharedname = Sender_DnC_Upgradeable_stub
diff --git a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index 6dc6a7c23d3..aba9dce0fd1 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -31,7 +31,7 @@ project (XSC_XML_Handlers) : acelib, xerces {
   }
 }
 
-project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory {
+project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typecodefactory, ciao_events_dnc {
   avoids += ace_for_tao
 
   verbatim(gnuace, macros) {