ChangeLogTag:Sun Sep 21 17:07:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

10 files changed, 63 insertions, 48 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 7d58b02a32c..101532b6bb4 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Sun Sep 21 17:07:45 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/handcrafted/BasicSP_EC/BasicSP.mpc:
+	* examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc:
+	* examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc:
+	* examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc:
+	* examples/handcrafted/BasicSP_EC/EC/EC.mpc
+	* examples/handcrafted/BasicSP_EC2/BasicSP.mpc:
+	* examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc:
+	* examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc:
+	* examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc:
+	  Changed the project file names so that they don't clash with the
+	  project names in examples/handcrafted/BasicSP. This shold get
+	  rid of warning in VC7 builds hosted by remedy.
+
 Fri Sep 19 14:27:57 2003  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
         * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc:
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc
index 51a7c0bc99b..c376a3eb30e 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMClosedED/BMClosedED.mpc
@@ -2,8 +2,8 @@
 // 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_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC_BMClosedED_stub): ciao_client {
+  after += BasicSP_EC_stub
   sharedname = BMClosedED_stub
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h
@@ -19,8 +19,8 @@ project(BMClosedED_stub): ciao_client {
   }
 }
 
-project(BMClosedED_svnt) : ciao_servant {
-  after += BasicSP_svnt BMClosedED_stub
+project(BasicSP_EC_BMClosedED_svnt) : ciao_servant {
+  after += BasicSP_EC_svnt BasicSP_EC_BMClosedED_stub
   sharedname  = BMClosedED_svnt
   libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -43,8 +43,8 @@ project(BMClosedED_svnt) : ciao_servant {
 }
 
 
-project(BMClosedED_exec) : ciao_component {
-  after   += BMClosedED_svnt
+project(BasicSP_EC_BMClosedED_exec) : ciao_component {
+  after   += BasicSP_EC_BMClosedED_svnt
   sharedname = BMClosedED_exec
   libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc
index 793ede6c890..95fac2f8a8c 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDevice/BMDevice.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project(BMDevice_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC_BMDevice_stub): ciao_client {
+  after += BasicSP_EC_stub
   sharedname = BMDevice_stub
 
   idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h
@@ -18,8 +18,8 @@ project(BMDevice_stub): ciao_client {
   }
 }
 
-project(BMDevice_svnt) : ciao_servant {
-  after += BMDevice_stub BasicSP_stub
+project(BasicSP_EC_BMDevice_svnt) : ciao_servant {
+  after += BasicSP_EC_BMDevice_stub BasicSP_EC_stub
   sharedname  = BMDevice_svnt
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -42,8 +42,8 @@ project(BMDevice_svnt) : ciao_servant {
 }
 
 
-project(BMDevice_exec) : ciao_component {
-  after += BMDevice_svnt
+project(BasicSP_EC_BMDevice_exec) : ciao_component {
+  after += BasicSP_EC_BMDevice_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc
index e8bfc8e9c50..d0eecb0d532 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BMDisplay/BMDisplay.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay"
 
-project(BMDisplay_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC_BMDisplay_stub): ciao_client {
+  after += BasicSP_EC_stub
   sharedname = BMDisplay_stub
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h
@@ -18,8 +18,8 @@ project(BMDisplay_stub): ciao_client {
   }
 }
 
-project(BMDisplay_svnt) : ciao_servant {
-  after += BasicSP_svnt BMDisplay_stub
+project(BasicSP_EC_BMDisplay_svnt) : ciao_servant {
+  after += BasicSP_EC_svnt BasicSP_EC_BMDisplay_stub
   sharedname  = BMDisplay_svnt
   libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -42,8 +42,8 @@ project(BMDisplay_svnt) : ciao_servant {
 }
 
 
-project(BMDisplay_exec) : ciao_component {
-  after += BMDisplay_svnt
+project(BasicSP_EC_BMDisplay_exec) : ciao_component {
+  after += BasicSP_EC_BMDisplay_svnt
   sharedname = BMDisplay_exec
   libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BasicSP.mpc
index 80eb6b1307d..6c5240a5b31 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC/BasicSP.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC/BasicSP.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(BasicSP_stub): ciao_client {
+project(BasicSP_EC_stub): ciao_client {
 
   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
@@ -18,7 +18,7 @@ project(BasicSP_stub): ciao_client {
   }
 }
 
-project(BasicSP_svnt) : ciao_server {
+project(BasicSP_EC_svnt) : ciao_server {
   after +=  BasicSP_stub
   sharedname = BasicSP_svnt
   libs    += BasicSP_stub TAO_RTEvent
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC/EC/EC.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC/EC/EC.mpc
index 1665b63eadc..a1f6ae75fe9 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC/EC/EC.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC/EC/EC.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC"
 
-project(EC_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC_EC_stub): ciao_client {
+  after += BasicSP_EC_stub
   sharedname = EC_stub
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h
@@ -18,8 +18,8 @@ project(EC_stub): ciao_client {
   }
 }
 
-project(EC_svnt) : ciao_servant {
-  after += BasicSP_svnt EC_stub
+project(BasicSP_EC_EC_svnt) : ciao_servant {
+  after += BasicSP_EC_svnt BasicSP_EC_EC_stub
   sharedname  = EC_svnt
   libs    += EC_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -42,8 +42,8 @@ project(EC_svnt) : ciao_servant {
 }
 
 
-project(EC_exec) : ciao_component {
-  after += EC_svnt
+project(BasicSP_EC_EC_exec) : ciao_component {
+  after += BasicSP_EC_svnt
   sharedname = EC_exec
   libs      += EC_stub BasicSP_stub EC_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -62,9 +62,9 @@ project(EC_exec) : ciao_component {
 
 
 
-project (EC_client) : ciao_client, valuetype {
+project (BasicSP_EC_EC_client) : ciao_client, valuetype {
   exename = client
-  after += EC_stub
+  after += BasicSP_EC_EC_stub
   libs += EC_stub BasicSP_stub TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc
index 51a7c0bc99b..06ed257dd61 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc
@@ -2,8 +2,8 @@
 // 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_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC2_BMClosedED_stub): ciao_client {
+  after += BasicSP_EC2_stub
   sharedname = BMClosedED_stub
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h
@@ -19,8 +19,8 @@ project(BMClosedED_stub): ciao_client {
   }
 }
 
-project(BMClosedED_svnt) : ciao_servant {
-  after += BasicSP_svnt BMClosedED_stub
+project(BasicSp_Ec2_BMClosedED_svnt) : ciao_servant {
+  after += BasicSP_EC2_svnt  BasicSP_EC2_BMClosedED_stub
   sharedname  = BMClosedED_svnt
   libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -43,8 +43,8 @@ project(BMClosedED_svnt) : ciao_servant {
 }
 
 
-project(BMClosedED_exec) : ciao_component {
-  after   += BMClosedED_svnt
+project(BasicSP_EC2_BMClosedED_exec) : ciao_component {
+  after   += BasicSP_EC2_BMClosedED_svnt
   sharedname = BMClosedED_exec
   libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc
index 793ede6c890..6663d478c9d 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project(BMDevice_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC2_BMDevice_stub): ciao_client {
+  after += BasicSP_EC2_stub
   sharedname = BMDevice_stub
 
   idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h
@@ -18,8 +18,8 @@ project(BMDevice_stub): ciao_client {
   }
 }
 
-project(BMDevice_svnt) : ciao_servant {
-  after += BMDevice_stub BasicSP_stub
+project(BasicSP_EC2_BMDevice_svnt) : ciao_servant {
+  after += BasicSP_EC2_BMDevice_stub BasicSP_EC2_stub
   sharedname  = BMDevice_svnt
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -42,8 +42,8 @@ project(BMDevice_svnt) : ciao_servant {
 }
 
 
-project(BMDevice_exec) : ciao_component {
-  after += BMDevice_svnt
+project(BasicSP_EC2_BMDevice_exec) : ciao_component {
+  after += BasicSP_EC2_BMDevice_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc
index e8bfc8e9c50..158a6670364 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay"
 
-project(BMDisplay_stub): ciao_client {
-  after += BasicSP_stub
+project(BasicSP_EC2_BMDisplay_stub): ciao_client {
+  after += BasicSP_EC2_stub
   sharedname = BMDisplay_stub
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h
@@ -18,8 +18,8 @@ project(BMDisplay_stub): ciao_client {
   }
 }
 
-project(BMDisplay_svnt) : ciao_servant {
-  after += BasicSP_svnt BMDisplay_stub
+project(BasicSP_EC2_BMDisplay_svnt) : ciao_servant {
+  after += BasicSP_EC2_svnt BasicSP_EC2_BMDisplay_stub
   sharedname  = BMDisplay_svnt
   libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
@@ -42,8 +42,8 @@ project(BMDisplay_svnt) : ciao_servant {
 }
 
 
-project(BMDisplay_exec) : ciao_component {
-  after += BMDisplay_svnt
+project(BasicSP_EC2_BMDisplay_exec) : ciao_component {
+  after += BMDisplay_EC2_svnt
   sharedname = BMDisplay_exec
   libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
   libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc
index 80eb6b1307d..3a4f1a24bf7 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(BasicSP_stub): ciao_client {
+project(BasicSP_EC2_stub): ciao_client {
 
   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
@@ -18,7 +18,7 @@ project(BasicSP_stub): ciao_client {
   }
 }
 
-project(BasicSP_svnt) : ciao_server {
+project(BasicSP_EC2_svnt) : ciao_server {
   after +=  BasicSP_stub
   sharedname = BasicSP_svnt
   libs    += BasicSP_stub TAO_RTEvent