Wed Oct 29 19:23:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 283 insertions, 52 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 56e33f819d4..696caa78d59 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Oct 29 19:23:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/AMH_AMI/AMH_AMI.mpc
+        * DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
+        * DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
+        * DevGuideExamples/Multithreading/Reactive/Reactive.mpc
+        * DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
+        * DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
+        * DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
+        * DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
+        * DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
+        * DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+        * DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
+        * DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+        * DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
+        * DevGuideExamples/ValueTypes/Bank/bank.mpc
+        * DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
+          Improved MPC files, removed not needed includes of CosNamingC.h
+
 Wed Oct 29 15:27:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/TAO_Internal.cpp:
diff --git a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
index 27d3be5234a..2b05216fbe1 100644
--- a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
+++ b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
@@ -1,8 +1,16 @@
 // $Id$
 
-project(*Client): taoexe, portableserver, messaging {
-  after += *Middle_Server
+project(*idl): taoidldefaults, amh, ami {
+  idlflags += -Wb,pch_include=amh_ami_pch.h
+  IDL_Files {
+    middle.idl
+    inner.idl
+  }
+  custom_only = 1
+}
 
+project(*Client): taoclient, messaging {
+  after += *idl
   IDL_Files {
   }
 
@@ -18,12 +26,10 @@ project(*Client): taoexe, portableserver, messaging {
   }
 }
 
-project(*Middle_Server): messaging, taoexe, portableserver, amh {
-  idlflags += -Wb,pch_include=amh_ami_pch.h
-  after += *Inner_Server
-
+project(*Middle_Server): messaging, taoserver, amh {
+  after += *idl
+  exename = midle_server
   IDL_Files {
-    middle.idl
   }
 
   Source_Files {
@@ -37,13 +43,11 @@ project(*Middle_Server): messaging, taoexe, portableserver, amh {
   }
 }
 
-project(*Inner_Server): messaging, taoexe, portableserver, ami {
-  idlflags += -Wb,pch_include=amh_ami_pch.h
-
+project(*Inner_Server): messaging, taoserver, ami {
+  after += *idl
+  exename = inner_server
   IDL_Files {
-    inner.idl
   }
-
   Source_Files {
     innerS.cpp
     innerC.cpp
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc b/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
index ab2cfcdcbac..65fd05368de 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
@@ -1,8 +1,17 @@
 // $Id$
 
+project(*idl): taoidldefaults {
+  idlflags += -Wb,pch_include=bidir_giop_pch.h
+  IDL_Files {
+    simple.idl
+    callback.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   exename = server
-  idlflags += -Wb,pch_include=bidir_giop_pch.h
+  after += *idl
   Source_Files {
     callbackC.cpp
     simpleC.cpp
@@ -10,11 +19,13 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoi
     simple_i.cpp
     server.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   exename = client
-  idlflags += -Wb,pch_include=bidir_giop_pch.h
+  after += *idl
   Source_Files {
     simpleC.cpp
     callbackC.cpp
@@ -22,4 +33,6 @@ project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoi
     callback_i.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
index b0cb811cce7..174cf26332f 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
@@ -1,18 +1,37 @@
 // $Id$
 
-project(Multithreading*Server): taoexe, portableserver {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(Multithreading*Server): taoserver {
   exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
     MessengerShutdownTimer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(Multithreading*Client): taoexe {
+project(Multithreading*Client): taoclient {
   exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc b/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
index e1b3677ea76..95fd2b9ada5 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
@@ -1,15 +1,36 @@
 // $Id$
 
-project(Multithreading*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(Multithreading*Server): taoserver, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(Multithreading*Client): taoexe, avoids_minimum_corba {
+project(Multithreading*Client): taoclient, avoids_minimum_corba {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
index f16096e21f6..eb38a354b26 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
@@ -1,15 +1,36 @@
 // $Id$
 
-project(Multi*Server): taoexe, portableserver {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(Multi*Server): taoserver {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(Multi*Client): taoexe, anytypecode {
+project(Multi*Client): taoclient, anytypecode {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc b/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
index 3e870bbd2a9..592f197b521 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
@@ -1,15 +1,36 @@
 // $Id$
 
-project(Multithreading*Server): taoexe, portableserver, avoids_minimum_corba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(Multithreading*Server): taoserver, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(Multithreading*Client): taoexe, anytypecode, avoids_minimum_corba {
+project(Multithreading*Client): taoclient, anytypecode, avoids_minimum_corba {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
index 742769bb17c..654ada76322 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
@@ -1,19 +1,40 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, pi_server, avoids_minimum_corba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     ServerInitializer.cpp
     ServerInterceptor.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, namingexe, pi, avoids_minimum_corba, interceptors {
+project(*Client): taoclient, pi, avoids_minimum_corba, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
index 17613d73381..bc1cfd78d0f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
@@ -5,7 +5,6 @@
 #include "tao/ORBInitializer_Registry.h"
 // Ensure that the PI library is linked in when building statically
 #include "tao/PI/PI.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 
 int
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
index b52d3c63910..28e5fe7e1ae 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
@@ -1,6 +1,15 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, pi_server, avoids_minimum_corba, iorinterceptor {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba, iorinterceptor {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
@@ -8,13 +17,25 @@ project(*Server): taoexe, portableserver, pi_server, avoids_minimum_corba, iorin
     ServerInterceptor.cpp
     ServerIORInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, pi, avoids_minimum_corba, interceptors {
+project(*Client): taoclient, pi, avoids_minimum_corba, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index 41372dddb13..2585bbc7d72 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -3,7 +3,6 @@
 #include "ClientInitializer.h"
 #include "ClientInterceptor.h"
 #include "MessengerC.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 
 ClientInitializer::ClientInitializer (void)
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
index 65c51a955bb..8992a47f748 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
@@ -6,7 +6,6 @@
 #include "tao/ORBInitializer_Registry.h"
 // Ensure that the PI library is linked in when building statically
 #include "tao/PI/PI.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 
 int
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
index 9282e1415c4..7f6034193a7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
@@ -7,7 +7,6 @@
 #include "tao/ORBInitializer_Registry.h"
 // Ensure that the PI_Server library is linked in when building statically
 #include "tao/PI_Server/PI_Server.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 #include <fstream>
 #include <fstream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
index d7526631b02..6c9f86ccd66 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
@@ -1,19 +1,40 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, pi_server, namingexe {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     ServerInitializer.cpp
     ServerInterceptor.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, pi, namingexe, interceptors {
+project(*Client): taoclient, pi, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
index 1a7e839618b..654ada76322 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
@@ -1,19 +1,40 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, pi_server, avoids_minimum_corba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     ServerInitializer.cpp
     ServerInterceptor.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, pi, avoids_minimum_corba, interceptors {
+project(*Client): taoclient, pi, avoids_minimum_corba, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc b/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
index fccf0848ef4..a41deb423a2 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
@@ -1,17 +1,32 @@
 // $Id$
 
-project(*_Dev_Server): taoexe, portableserver, valuetype, avoids_minimum_corba {
+project(*idl): taoidldefaults, valuetype {
   idlflags += -Wb,pch_include=_pch.h
+  IDL_Files {
+    bank.idl
+  }
+  custom_only = 1
+}
+
+project(*_Dev_Server): taoserver, valuetype, avoids_minimum_corba {
+  after += *idl
   Source_Files {
     server.cpp
   }
+  Source_Files {
+    bankC.cpp
+    bankS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*_Dev_Client): taoexe, portableserver, valuetype, avoids_minimum_corba {
-  after += *_Dev_Server
-
+project(*_Dev_Client): taoclient, valuetype, avoids_minimum_corba {
+  after += *idl
   Source_Files {
     client.cpp
+  }
+  Source_Files {
     bankC.cpp
   }
   IDL_Files {
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc b/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
index 1dd877e26c5..2af52f2b161 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
@@ -1,22 +1,39 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, valuetype, avoids_minimum_corba {
-  idlflags += -Wb,pch_include=_pch.h 
+project(*idl): taoidldefaults, valuetype {
+  idlflags += -Wb,pch_include=_pch.h
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, valuetype, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     Message_i.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, valuetype, avoids_minimum_corba {
-  after += ValueTypes_Server
-
+project(*Client): taoclient, valuetype, avoids_minimum_corba {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
     Message_i.cpp
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
   IDL_Files {
   }
 }