Fri Sep 2 17:38:31 2005 William Otte <wotte@dre.vanderbilt.edu>

6 files changed, 24 insertions, 14 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index cd99661d0a3..d671756ec25 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Sep  2 17:38:31 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+	* performance-tests/Protocols/Controller/Controller.mpc
+	* performance-tests/Protocols/Receiver/Receiver.mpc
+	* performance-tests/Protocols/Sender/Sender.mpc
+	* performance-tests/Protocols/common/Protocols.mpc
+	* tests/CIDL/CodeGen/CodeGen.mpc
+
+	Migrated to modern CIAO base projects. 
+	
 Fri Sep  2 16:41:08 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* performance-tests/Benchmark/Benchmark.mpc
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index bc3e87ccb3d..2a6f2e404b6 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (perf*) : ciao_client, rtcorba, exceptions {
+project (perf*) : ciao_client_dnc, rtcorba, exceptions {
   after += Protocols_Sender_stub Protocols_Receiver_stub
   includes += ../Sender
   includes += ../Receiver
diff --git a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 28022a8c680..5f83db6a1e0 100644
--- a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
 
-project(Protocols_Receiver_stub): ciao_client, exceptions {
+project(Protocols_Receiver_stub): ciao_client_dnc, exceptions {
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Receiver_stub
@@ -17,7 +17,7 @@ project(Protocols_Receiver_stub): ciao_client, exceptions {
   }
 }
 
-project(Protocols_Receiver_svnt) : ciao_servant, exceptions {
+project(Protocols_Receiver_svnt) : ciao_servant_dnc, exceptions {
   after += Protocols_svnt Protocols_Receiver_stub
   sharedname  = Protocols_Receiver_svnt
   libs    += Protocols_Receiver_stub Protocols_stub Protocols_svnt
@@ -40,7 +40,7 @@ project(Protocols_Receiver_svnt) : ciao_servant, exceptions {
 }
 
 
-project(Protocols_Receiver_exec) : ciao_component, exceptions {
+project(Protocols_Receiver_exec) : ciao_component_dnc, exceptions {
   after   += Protocols_Receiver_svnt
   sharedname = Protocols_Receiver_exec
   libs      += Protocols_Receiver_stub Protocols_Receiver_svnt Protocols_stub Protocols_svnt
diff --git a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 81ea3b78c56..ae6ba814b79 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Sender"
 
-project(Protocols_Sender_stub): ciao_client, exceptions {
+project(Protocols_Sender_stub): ciao_client_dnc, exceptions {
   libs += Protocols_stub
   after += Protocols_stub
   sharedname = Protocols_Sender_stub
@@ -17,7 +17,7 @@ project(Protocols_Sender_stub): ciao_client, exceptions {
   }
 }
 
-project(Protocols_Sender_svnt) : ciao_servant, exceptions {
+project(Protocols_Sender_svnt) : ciao_servant_dnc, exceptions {
   after += Protocols_svnt Protocols_Sender_stub
   sharedname  = Protocols_Sender_svnt
   libs    += Protocols_Sender_stub Protocols_stub Protocols_svnt
@@ -40,7 +40,7 @@ project(Protocols_Sender_svnt) : ciao_servant, exceptions {
 }
 
 
-project(Protocols_Sender_exec) : ciao_component, rtcorba, exceptions {
+project(Protocols_Sender_exec) : ciao_component_dnc, rtcorba, exceptions {
   after   += Protocols_Sender_svnt
   sharedname = Protocols_Sender_exec
   libs      += Protocols_Sender_stub Protocols_Sender_svnt Protocols_stub Protocols_svnt
diff --git a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 4f6dad45306..43caa154675 100644
--- a/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n Protocols"
 
-project(Protocols_stub): ciao_client {
+project(Protocols_stub): ciao_client_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
@@ -16,7 +16,7 @@ project(Protocols_stub): ciao_client {
   }
 }
 
-project(Protocols_svnt) : ciao_servant {
+project(Protocols_svnt) : ciao_servant_dnc {
   after +=  Protocols_stub
   sharedname  = Protocols_svnt
   libs    += Protocols_stub 
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 87615fbb617..0a3ffc979e3 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 {
+project(CIDL_Basic_stub): ciao_client_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
@@ -20,7 +20,7 @@ project(CIDL_Basic_stub): ciao_client {
   }
 }
 
-project(CIDL_Basic_svnt) : ciao_servant {
+project(CIDL_Basic_svnt) : ciao_servant_dnc {
   after +=  CIDL_Basic_stub
   sharedname = CIDL_Basic_svnt
   libs    += CIDL_Basic_stub
@@ -42,7 +42,7 @@ project(CIDL_Basic_svnt) : ciao_servant {
   }
 }
 
-project(CodeGen_stub): ciao_client {
+project(CodeGen_stub): ciao_client_dnc {
   after += CIDL_Basic_stub
   libs    += CIDL_Basic_stub
   sharedname = CodeGen_stub
@@ -63,7 +63,7 @@ project(CodeGen_stub): ciao_client {
   }
 }
 
-project(CodeGen_svnt) : ciao_servant {
+project(CodeGen_svnt) : ciao_servant_dnc {
   after += CIDL_Basic_svnt CodeGen_stub
   sharedname  = CodeGen_svnt
   libs    += CodeGen_stub CIDL_Basic_stub CIDL_Basic_svnt
@@ -95,7 +95,7 @@ project(CodeGen_svnt) : ciao_servant {
 }
 
 
-project(CodeGen_exec) : ciao_component {
+project(CodeGen_exec) : ciao_component_dnc {
   after   += CodeGen_svnt CodeGen_stub
   sharedname = CodeGen_exec
   libs      += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt