ChangeLogTag: Tue Apr 11 06:35:14 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

27 files changed, 78 insertions, 78 deletions

diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index b294d5db74e..f652394bee3 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Stock_Base"
 
-project(Stock_Base_stub): ciao_client_dnc {
+project(Stock_Base_stub): ciao_component_dnc {
 
   sharedname = Stock_Base_stub
   idlflags += -Wb,stub_export_macro=STOCK_BASE_STUB_Export -Wb,stub_export_include=Stock_Base_stub_export.h -Wb,skel_export_macro=STOCK_BASE_SVNT_Export -Wb,skel_export_include=Stock_Base_svnt_export.h
diff --git a/TAO/CIAO/examples/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/BasicSP/BasicSP.mpc
index 20f682a413b..b0b9999b3d2 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_client_dnc {
+project(BasicSP_DnC_stub): ciao_component_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/Display/HUDisplay.mpc b/TAO/CIAO/examples/Display/HUDisplay.mpc
index 29016a5c4d6..a7391f6792a 100644
--- a/TAO/CIAO/examples/Display/HUDisplay.mpc
+++ b/TAO/CIAO/examples/Display/HUDisplay.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(HUDisplay_DnC_stub): ciao_client_dnc {
-  
+project(HUDisplay_DnC_stub): ciao_component_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
   dynamicflags   = HUDISPLAY_STUB_BUILD_DLL
@@ -19,20 +19,20 @@ project(HUDisplay_DnC_stub): ciao_client_dnc {
 project(HUDisplay_DnC_svnt) : ciao_servant_dnc {
   after +=  HUDisplay_DnC_stub
   sharedname  = HUDisplay_DnC_svnt
-  libs    += HUDisplay_DnC_stub 
-  
+  libs    += HUDisplay_DnC_stub
+
   //idlflags  +=  -Wb,export_macro=HUDISPLAY_SVNT_Export -Wb,export_include=HUDisplay_svnt_export.h
-  
+
   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
-  
+
   dynamicflags = HUDISPLAY_SVNT_BUILD_DLL
 
-  
+
 
   Source_Files {
-    
+
     HUDisplayS.cpp
-    
+
   }
 }
 
diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index b5c00fea2c8..c42d1c0358c 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_DnC_stub): ciao_client_dnc {
-  
+project(Hello_Base_DnC_stub): ciao_component_dnc {
+
   sharedname = Hello_Base_DnC_stub
   idlflags += -Sc \
               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
@@ -18,11 +18,11 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
   Source_Files {
     Hello_BaseC.cpp
   }
-  
+
   Header_Files {
     Hello_BaseC.h
   }
-  
+
   Inline_Files {
     Hello_BaseC.inl
   }
@@ -31,14 +31,14 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
 project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   after +=  Hello_Base_DnC_stub
   sharedname  = Hello_Base_DnC_svnt
-  libs    += Hello_Base_DnC_stub 
-  
+  libs    += Hello_Base_DnC_stub
+
   idlflags  += -Sc \
                -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
-  dynamicflags = HELLO_BASE_SVNT_BUILD_DLL 
+  dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Hello_Base.idl
@@ -47,11 +47,11 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
   Source_Files {
     Hello_BaseS.cpp
   }
-  
+
   Header_Files {
     Hello_BaseS.h
   }
-  
+
   Inline_Files {
     Hello_BaseS.inl
   }
diff --git a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
index 22c0598f8a7..5b908c14f1b 100644
--- a/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/examples/Swapping/Hello_Base/Hello_Base.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Hello_Base"
 
-project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc {
-  
+project(Hello_Base_DnC_Upgradeable_stub): ciao_component_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
   dynamicflags   = HELLO_BASE_STUB_BUILD_DLL
@@ -19,8 +19,8 @@ project(Hello_Base_DnC_Upgradeable_stub): ciao_client_dnc {
 project(Hello_Base_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   after +=  Hello_Base_DnC_Upgradeable_stub
   sharedname  = Hello_Base_DnC_Upgradeable_svnt
-  libs    += Hello_Base_DnC_Upgradeable_stub 
-  
+  libs    += 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
   dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 43caa154675..4c01677de0e 100644
--- a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_stub): ciao_client_dnc {
-  
+project(Protocols_stub): ciao_component_dnc {
+
   sharedname = Protocols_stub
   idlflags += -Wb,stub_export_macro=PROTOCOLS_STUB_Export -Wb,stub_export_include=Protocols_stub_export.h -Wb,skel_export_macro=PROTOCOLS_SVNT_Export -Wb,skel_export_include=Protocols_svnt_export.h
   dynamicflags   = PROTOCOLS_STUB_BUILD_DLL
@@ -19,8 +19,8 @@ project(Protocols_stub): ciao_client_dnc {
 project(Protocols_svnt) : ciao_servant_dnc {
   after +=  Protocols_stub
   sharedname  = Protocols_svnt
-  libs    += Protocols_stub 
-  
+  libs    += Protocols_stub
+
   idlflags  +=  -Wb,export_macro=PROTOCOLS_SVNT_Export -Wb,export_include=Protocols_svnt_export.h
   dynamicflags = PROTOCOLS_SVNT_BUILD_DLL
 
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
index 88e76bdb6e6..2991caf58f3 100644
--- a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
+++ b/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
@@ -1,7 +1,7 @@
 //$Id$
 
-project(ENW_stub): ciao_client_dnc, event {
-  
+project(ENW_stub): ciao_component_dnc, event {
+
   sharedname = ENW_stub
   idlflags += -Wb,stub_export_macro=ENW_STUB_Export -Wb,stub_export_include=ENW_stub_export.h -Wb,skel_export_macro=ENW_SVNT_Export -Wb,skel_export_include=ENW_svnt_export.h
   dynamicflags   = ENW_STUB_BUILD_DLL
@@ -18,8 +18,8 @@ project(ENW_stub): ciao_client_dnc, event {
 project(ENW_svnt) : ciao_servant_dnc, event {
   after +=  ENW_stub
   sharedname  = ENW_svnt
-  libs    += ENW_stub 
-  
+  libs    += ENW_stub
+
   dynamicflags = ENW_SVNT_BUILD_DLL
 
   Source_Files {
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 0a3ffc979e3..faf1f9917b2 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CIDL_Basic_stub): ciao_client_dnc {
+project(CIDL_Basic_stub): ciao_component_dnc {
 
   sharedname = CIDL_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
index 1372ae82668..5613617d1af 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Attributes"
 
-project(Attributes_stub): ciao_client_dnc {
-  
+project(Attributes_stub): ciao_component_dnc {
+
   sharedname = Attributes_stub
   idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h
   dynamicflags   = ATTRIBUTES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
index a1a90abe9a3..11d5d9e28d9 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n EventSink"
 
-project(EventSink_stub): ciao_client_dnc {
-  
+project(EventSink_stub): ciao_component_dnc {
+
   sharedname = EventSink_stub
   idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h
   dynamicflags   = EVENTSINK_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
index e98d21e8a5a..1ef539cc479 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n EventSource"
 
-project(EventSource_stub): ciao_client_dnc {
-  
+project(EventSource_stub): ciao_component_dnc {
+
   sharedname = EventSource_stub
   idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h
   dynamicflags   = EVENTSOURCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
index 1f1ba286b7d..70c54bba7b4 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Facets"
 
-project(Facets_stub): ciao_client_dnc {
-  
+project(Facets_stub): ciao_component_dnc {
+
   sharedname = Facets_stub
   idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h
   dynamicflags   = FACETS_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
index 6ecfc50f438..53db53dee90 100644
--- a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Receptacles"
 
-project(Receptacles_stub): ciao_client_dnc {
-  
+project(Receptacles_stub): ciao_component_dnc {
+
   sharedname = Receptacles_stub
   idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export -Wb,stub_export_include=Receptacles_stub_export.h -Wb,skel_export_macro=RECEPTACLES_SVNT_Export -Wb,skel_export_include=Receptacles_svnt_export.h
   dynamicflags   = RECEPTACLES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
index bffbdebb9df..b9ab054bae6 100644
--- a/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Abstract"
 
-project(Abstract_stub): ciao_client_dnc {
-  
+project(Abstract_stub): ciao_component_dnc {
+
   sharedname = Abstract_stub
   idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h
   dynamicflags   = ABSTRACT_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
index 81faf3a8e4f..a8f153cfb1d 100644
--- a/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
+++ b/TAO/CIAO/tests/IDL3/Events/Regular/Regular.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Regular"
 
-project(Regular_stub): ciao_client_dnc {
-  
+project(Regular_stub): ciao_component_dnc {
+
   sharedname = Regular_stub
   idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h
   dynamicflags   = REGULAR_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
index 413748705d0..931fa200079 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HomeAttributes"
 
-project(HomeAttributes_stub): ciao_client_dnc {
-  
+project(HomeAttributes_stub): ciao_component_dnc {
+
   sharedname = HomeAttributes_stub
   idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h
   dynamicflags   = HOMEATTRIBUTES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
index f364c13c293..8130df04024 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Basic/Basic.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Basic"
 
-project(IDL3_Basic_stub): ciao_client_dnc {
-  
+project(IDL3_Basic_stub): ciao_component_dnc {
+
   sharedname = Homes_Basic_stub
   idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h
   dynamicflags   = BASIC_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
index 7ff6c2a75bc..aa13235daf0 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Factory/Factory.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Factory"
 
-project(Factory_stub): ciao_client_dnc {
-  
+project(Factory_stub): ciao_component_dnc {
+
   sharedname = Factory_stub
   idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h
   dynamicflags   = FACTORY_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
index 0409af4d8ad..965043e4558 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Finder/Finder.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Finder"
 
-project(Finder_stub): ciao_client_dnc {
-  
+project(Finder_stub): ciao_component_dnc {
+
   sharedname = Finder_stub
   idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h
   dynamicflags   = FINDER_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
index b8c27d5b42d..ef6226a3426 100644
--- a/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
+++ b/TAO/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Inheritance"
 
-project(Inheritance_stub): ciao_client_dnc {
-  
+project(Inheritance_stub): ciao_component_dnc {
+
   sharedname = Inheritance_stub
   idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h
   dynamicflags   = INHERITANCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
index 5759c52f43c..e83dabd8b0e 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICBasic"
 
-project(ICBasic_stub): ciao_client_dnc {
-  
+project(ICBasic_stub): ciao_component_dnc {
+
   sharedname = ICBasic_stub
   idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h
   dynamicflags   = ICBASIC_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
index c86b9521ce4..103ba9123d6 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICEventSource"
 
-project(ICEventSource_stub): ciao_client_dnc {
-  
+project(ICEventSource_stub): ciao_component_dnc {
+
   sharedname = ICEventSource_stub
   idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h
   dynamicflags   = ICEVENTSOURCE_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
index d47827f2a2d..4307a8bfb9c 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n ICReceptacles"
 
-project(ICReceptacles_stub): ciao_client_dnc {
-  
+project(ICReceptacles_stub): ciao_component_dnc {
+
   sharedname = ICReceptacles_stub
   idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h
   dynamicflags   = ICRECEPTACLES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
index 7c3478d0b2e..07c4820fce6 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Events"
 
-project(Events_stub): ciao_client_dnc {
-  
+project(Events_stub): ciao_component_dnc {
+
   sharedname = Events_stub
   idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h
   dynamicflags   = EVENTS_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
index c81e215abfa..cd97e268c98 100644
--- a/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
+++ b/TAO/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Homes"
 
-project(Homes_stub): ciao_client_dnc {
-  
+project(Homes_stub): ciao_component_dnc {
+
   sharedname = Homes_stub
   idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h
   dynamicflags   = HOMES_STUB_BUILD_DLL
diff --git a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
index 9814f248c5a..f0c020b3169 100644
--- a/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
+++ b/TAO/CIAO/tests/IDL3/Lookup/lookup_test.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project(LookupTest_stub): ciao_client_dnc {
-  
+project(LookupTest_stub): ciao_component_dnc {
+
   sharedname = LookupTest_stub
   idlflags += -Sc
 
diff --git a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
index f4393115c4f..190b358d5c8 100644
--- a/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
+++ b/TAO/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Minimum_Base"
 
-project(Minimum_Base_DnC_stub): ciao_client_dnc {
-  
+project(Minimum_Base_DnC_stub): ciao_component_dnc {
+
   sharedname = Minimum_Base_DnC_stub
   idlflags += -Sc \
               -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
@@ -18,11 +18,11 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc {
   Source_Files {
     Minimum_BaseC.cpp
   }
-  
+
   Header_Files {
     Minimum_BaseC.h
   }
-  
+
   Inline_Files {
     Minimum_BaseC.inl
   }
@@ -31,14 +31,14 @@ project(Minimum_Base_DnC_stub): ciao_client_dnc {
 project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   after +=  Minimum_Base_DnC_stub
   sharedname  = Minimum_Base_DnC_svnt
-  libs    += Minimum_Base_DnC_stub 
-  
+  libs    += Minimum_Base_DnC_stub
+
   idlflags  += -Sc \
                -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \
                -Wb,stub_export_include=Minimum_Base_stub_export.h \
                -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \
                -Wb,skel_export_include=Minimum_Base_svnt_export.h
-  dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL 
+  dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL
 
   IDL_Files {
     Minimum_Base.idl
@@ -47,11 +47,11 @@ project(Minimum_Base_DnC_svnt) : ciao_servant_dnc {
   Source_Files {
     Minimum_BaseS.cpp
   }
-  
+
   Header_Files {
     Minimum_BaseS.h
   }
-  
+
   Inline_Files {
     Minimum_BaseS.inl
   }