Tue Oct 28 15:18:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 52 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6ae201db15a..072732bb9e8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Oct 28 15:18:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/GettingStarted/GettingStarted.mpc
+        * DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
+        * DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
+          Use custom idl project
+
+        * DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
+          Layout change
+
 Tue Oct 28 11:45:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
         * tests/RTCORBA/Server_Protocol/server.cpp:
diff --git a/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc b/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
index 5a435cef281..eb1749c3fc7 100644
--- a/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
+++ b/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
@@ -25,7 +25,6 @@ project(*Server): taoexe, portableserver {
 project(*Client): taoexe {
   after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
   Source_Files {
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
index 4541afe777f..00628b354c0 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
@@ -1,4 +1,22 @@
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
 project(LocalObject*Server): taoexe, portableserver {
+  after += *idl
+  Source_Files {
+    Messenger_i.cpp
+    MessengerServer.cpp
+  }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
index 85f96331c04..876fc1e4ac3 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
@@ -39,10 +39,10 @@ Messenger_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
 
 void
 Messenger_Locator_i::postinvoke (const PortableServer::ObjectId &,
-                                            PortableServer::POA_ptr,
-                                            const char *,
-                                            void * cookie,
-                                            PortableServer::Servant servant)
+                                 PortableServer::POA_ptr,
+                                 const char *,
+                                 void * cookie,
+                                 PortableServer::Servant servant)
 {
 
   std::cout << "postinvoke called..." << std::endl;
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc b/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
index 96fadf03e4a..298deff6812 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
@@ -1,16 +1,35 @@
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoexe, portableserver, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
     MessengerLocator_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoexe, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }