Tue Jun 9 13:25:10 UTC 2009 Paul Calabrese <calabrese_p@ociweb.com>

63 files changed, 189 insertions, 184 deletions

diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
index 2fdbf6e927e..0aeb5afe0ec 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
@@ -33,7 +33,7 @@ AMH_Messenger_i::send_message (
   std::cout << "Message:      " << message << std::endl;
   CORBA::String_var inout_message_arg =
     CORBA::string_dup("Thanks for the message.");
-  CORBA::Boolean result = 1;
+  CORBA::Boolean result = true;
 
   _tao_rh->send_message(result,inout_message_arg.inout ());
 }
diff --git a/TAO/DevGuideExamples/AMH/MessengerServer.cpp b/TAO/DevGuideExamples/AMH/MessengerServer.cpp
index 60742b2413f..fce26c51fb6 100644
--- a/TAO/DevGuideExamples/AMH/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/AMH/MessengerServer.cpp
@@ -51,11 +51,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create a servant.
-    AMH_Messenger_i servant;
+    PortableServer::Servant_var<AMH_Messenger_i> servant = new AMH_Messenger_i;
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
-    PortableServer::ObjectId_var oid = poa->activate_object( &servant );
+    PortableServer::ObjectId_var oid = poa->activate_object( servant.in() );
     obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( obj.in() );
     std::ofstream iorFile(ACE_TEXT_ALWAYS_CHAR(ior_output_file.c_str()));
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.cpp b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
index c825da18737..175b4ac3e22 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
@@ -31,5 +31,5 @@ CORBA::Boolean Messenger_i::send_message (
   std::cout << "Message:      " << message << std::endl;
   CORBA::string_free(message);
   message = CORBA::string_dup("Thanks for the message.");
-  return 1;
+  return true;
 }
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
index edcbcba9aef..9dc4446b5d2 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
@@ -42,11 +42,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create a servant.
-    Inner_i servant(dont_crash);
+    PortableServer::Servant_var<Inner_i> servant = new Inner_i(dont_crash);
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
-    PortableServer::ObjectId_var oid = poa->activate_object( &servant );
+    PortableServer::ObjectId_var oid = poa->activate_object( servant.in() );
     obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( obj.in() );
     ACE_CString iorname ("inner.ior");
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
index aaa49807717..25dee372b33 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
@@ -17,7 +17,7 @@ Callback_i::~Callback_i (void)
 void Callback_i::shutdown ()
 {
   std::cout << "Performing clean shutdown." << std::endl;
-  const int wait = 0;
+  CORBA::Boolean wait = false;
   orb_->shutdown(wait);
 }
 
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
index c40f8f0c91e..369dc556de1 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
@@ -70,10 +70,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     obj = orb->string_to_object(ior.c_str());
     Simple_var server = Simple::_narrow (obj.in());
 
-    Callback_i callback_svt(orb.in());
+    PortableServer::Servant_var<Callback_i> callback_svt = new Callback_i(orb.in());
 
     // Register and activate callback servant
-    PortableServer::ObjectId_var id = poa->activate_object(&callback_svt);
+    PortableServer::ObjectId_var id = poa->activate_object(callback_svt.in());
     obj = poa->id_to_reference(id.in());
     Callback_var callback = Callback::_narrow(obj.in());
 
@@ -86,7 +86,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     orb->run();
 
-    int etherealize = 1, wait = 1;
+    CORBA::Boolean etherealize = true, wait = true;
     poa->destroy(etherealize, wait);
     orb->destroy();
 
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
index 405b3d0637d..1d5164c621f 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
@@ -70,10 +70,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
     poa_manager->activate ();
 
-    Simple_i svt(orb.in(), callback_count);
+    PortableServer::Servant_var<Simple_i> svt = new Simple_i(orb.in(), callback_count);
 
     // Register and activate Simple servant
-    PortableServer::ObjectId_var id = poa->activate_object(&svt);
+    PortableServer::ObjectId_var id = poa->activate_object(svt.in());
     obj = poa->id_to_reference(id.in());
     Simple_var server = Simple::_narrow(obj.in());
 
@@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     while (true) {
 
       // returns 1 as soon as it has successfully called back.
-      if (svt.call_client()) {
+      if (svt->call_client()) {
         break;
       }
 
@@ -100,7 +100,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     std::cout << "Event loop finished." << std::endl;
 
-    int etherealize = 1, wait = 1;
+    CORBA::Boolean etherealize = true, wait = true;
     poa->destroy(etherealize, wait);
     orb->destroy();
 
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
index ed01838377c..e93e0e8b78b 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
@@ -37,7 +37,7 @@ void Simple_i::callback_object (Callback_ptr cb)
 
 void Simple_i::shutdown ()
 {
-  const int wait = 0;
+  CORBA::Boolean wait = false;
   orb_->shutdown(wait);
 }
 
diff --git a/TAO/DevGuideExamples/DevGuideExamples.mwc b/TAO/DevGuideExamples/DevGuideExamples.mwc
index 97d3bc5c8fe..b07eebca11d 100644
--- a/TAO/DevGuideExamples/DevGuideExamples.mwc
+++ b/TAO/DevGuideExamples/DevGuideExamples.mwc
@@ -1,5 +1,4 @@
 // $Id$ 
 
 workspace {
-  cmdline = -include $PWD
 }
diff --git a/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp b/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
index 578fc2da9c4..3bc606378b9 100644
--- a/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
@@ -21,11 +21,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create a servant.
-    Messenger_i servant;
+    PortableServer::Servant_var<Messenger_i> servant = new Messenger_i();
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
-    PortableServer::ObjectId_var oid = poa->activate_object( &servant );
+    PortableServer::ObjectId_var oid = poa->activate_object( servant.in() );
     obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( obj.in() );
     std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 12a9a638b41..27d02a450dc 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -24,7 +24,7 @@ CORBA::Boolean Messenger_i::send_message (
   std::cout << "Message:      " << message << std::endl;
   CORBA::string_free(message);
   message = CORBA::string_dup("Thanks for the message.");
-  return 1;
+  return true;
   
 }
 
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
index 8d32b9298bd..9934b61457d 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
@@ -63,7 +63,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     orb->run();
 
     // Release resources
-    rootPOA->destroy(1,1);
+    rootPOA->destroy(true,true);
     orb->destroy();
   }
   catch(const CORBA::Exception& ex) {
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
index e9afc3a5e6c..a94421ea765 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
@@ -43,8 +43,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     mgr->activate();
 
     // Register an AMI handler for the Messenger interface
-    MessengerHandler servant(orb.in());
-    PortableServer::ObjectId_var oid = poa->activate_object(&servant);
+    PortableServer::Servant_var<MessengerHandler> servant = 
+      new MessengerHandler(orb.in());
+    PortableServer::ObjectId_var oid = poa->activate_object(servant.in());
     obj = poa->id_to_reference(oid.in());
     AMI_MessengerHandler_var handler = AMI_MessengerHandler::_narrow(obj.in());
 
@@ -82,7 +83,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     // Our simple servant will exit as soon as it receives the results.
     orb->run();
 
-    if (servant.message_was_sent())
+    if (servant->message_was_sent())
     {
       // Note : We can't use the
       ACE_Time_Value delay = ACE_OS::gettimeofday() - time_sent;
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
index 05b7704ef2f..60c8dac7e12 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
@@ -38,7 +38,7 @@ void MessengerHandler::send_message (
     std::cerr << "Error: Message was not sent." << std::endl;
   }
   // Our simple test just shuts down after sending one message.
-  orb_->shutdown(0);
+  orb_->shutdown(false);
 }
 
 void MessengerHandler::send_message_excep (Messaging::ExceptionHolder* excep_holder)
@@ -52,5 +52,5 @@ void MessengerHandler::send_message_excep (Messaging::ExceptionHolder* excep_hol
   {
     std::cerr << "A CORBA Exception was thrown: " << ex << std::endl;
   }
-  orb_->shutdown(0);
+  orb_->shutdown(false);
 }
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
index faef3a6dc2c..7929c8c8de1 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
@@ -17,12 +17,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     // Messenger_i::send_message() throw an exception if e
     // has been passed as the command lin argument.
     unsigned int seconds_to_wait = 0;
-    CORBA::Boolean servant_throws_exception = 0;
+    CORBA::Boolean servant_throws_exception = false;
     if (argc == 2)
     {
       if (argv[1][0] == 'e')
       {
-        servant_throws_exception = 1;
+        servant_throws_exception = true;
         std::cout << "Messenger_i::send_message() will throw an exception." << std::endl;
       }
       else
@@ -42,10 +42,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     mgr->activate();
 
     // Create an object
-    Messenger_i servant(seconds_to_wait, servant_throws_exception);
+    PortableServer::Servant_var<Messenger_i> servant = new
+      Messenger_i(seconds_to_wait, servant_throws_exception);
 
     // Write its stringified reference to stdout
-    PortableServer::ObjectId_var oid =  poa->activate_object(&servant);
+    PortableServer::ObjectId_var oid =  poa->activate_object(servant.in());
     obj = poa->id_to_reference(oid.in());
     Messenger_var messenger = Messenger::_narrow(obj.in());
     CORBA::String_var str = orb->object_to_string(messenger.in());
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
index b4e205cde4d..73cf55fb336 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
@@ -53,7 +53,7 @@ CORBA::Boolean Messenger_i::send_message (
   time_sent = static_cast<CORBA::Long> (ACE_OS::gettimeofday().sec());
 
   // We will assume the message has been sent, so return true
-  return 1;
+  return true;
 }
 
 
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
index d3663bdd840..dcec42b2b61 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
@@ -18,10 +18,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     mgr->activate();
 
     // Create an object
-    Messenger_i messenger_servant;
+    PortableServer::Servant_var<Messenger_i> messenger_servant =
+      new Messenger_i;
 
     // Write its stringified reference to a file
-    PortableServer::ObjectId_var oid = poa->activate_object(&messenger_servant);
+    PortableServer::ObjectId_var oid = poa->activate_object(messenger_servant.in());
     obj = poa->id_to_reference(oid.in());
     Messenger_var messenger = Messenger::_narrow(obj.in());
     CORBA::String_var str = orb->object_to_string(messenger.in());
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
index 0589a19bcab..bd769b65ce7 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
@@ -57,7 +57,7 @@ public:
       {
         char c;
         std::cin.get (c);
-        orb_->shutdown (1);
+        orb_->shutdown (true);
         return 0;
       }
   private:
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp
index e16053c3933..2672ea53671 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp
@@ -12,6 +12,6 @@ int MessengerShutdownTimer::handle_timeout (
   const void*)
 {
   ACE_DEBUG((LM_DEBUG, "In MessengerShutdownTimer::handle_timeout\n"));
-  orb_->shutdown (0);
+  orb_->shutdown (false);
   return 0;
 }
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index 79cdb4982d6..1843bc73b98 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -31,10 +31,10 @@ CORBA::Boolean Messenger_i::send_message (
   std::cout << "Message:      " << message << std::endl;
   CORBA::string_free(message);
   message = CORBA::string_dup("Thanks for the message.");
-  return 1;
+  return true;
 }
 
 void Messenger_i::shutdown ()
 {
-  orb_->shutdown(0);
+  orb_->shutdown(false);
 }
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/run_test.pl b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/run_test.pl
index 7e96b25efeb..327eae8a96d 100755
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/run_test.pl
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/run_test.pl
@@ -11,7 +11,7 @@ use PerlACE::Run_Test;
 $ior = PerlACE::LocalFile ("Messenger.ior");
 unlink $ior;
 
-$server_args = "-ORBEndpoint iiop://localhost";
+$server_args = "-ORBListenEndpoints iiop://localhost";
 
 # -------------------------------------------------------------------
 # Test 1: Shutdown on client invocation
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
index 22bd190af74..5dc50c06521 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
@@ -18,12 +18,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create a servant.
-    Messenger_i messenger_servant;
+    PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
+      poa->activate_object( messenger_servant.in() );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index df6eaf11a49..4fae956687b 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -30,5 +30,5 @@ CORBA::Boolean Messenger_i::send_message (
   std::cout << "Message:      " << message << std::endl;
   CORBA::string_free(message);
   message = CORBA::string_dup("Thanks for the message.");
-  return 1;
+  return true;
 }
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/run_test.pl b/TAO/DevGuideExamples/Multithreading/Reactive/run_test.pl
index a91338e6aab..fb47fe48665 100755
--- a/TAO/DevGuideExamples/Multithreading/Reactive/run_test.pl
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/run_test.pl
@@ -13,7 +13,7 @@ unlink $ior;
 
 # start MessengerServer
 
-$S = new PerlACE::Process("MessengerServer", "-ORBEndpoint iiop://localhost");
+$S = new PerlACE::Process("MessengerServer", "-ORBListenEndpoints iiop://localhost");
 $S->Spawn();
 
 if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
index 22bd190af74..5dc50c06521 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
@@ -18,12 +18,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create a servant.
-    Messenger_i messenger_servant;
+    PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
+      poa->activate_object( messenger_servant.in() );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index 137230f1c26..f5699cb9686 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -34,6 +34,6 @@ CORBA::Boolean Messenger_i::send_message (
   std::ostringstream ostr;
   ostr << "Message handled on thread " << ACE_Thread::self();
   message = CORBA::string_dup(ostr.str().c_str());
-  return 1;
+  return true;
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
index 95c22f3c9de..e669d1d1995 100755
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
@@ -15,7 +15,7 @@ unlink $ior;
 
 print STDOUT "Starting MessengerServer\n";
 
-$S = new PerlACE::Process("MessengerServer", "-ORBSvcConf server.conf -ORBEndpoint iiop://localhost");
+$S = new PerlACE::Process("MessengerServer", "-ORBSvcConf server.conf -ORBListenEndpoints iiop://localhost");
 $S->Spawn();
 
 if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
index 6035cd3cbcb..2e0865eac9d 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
@@ -39,12 +39,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create a servant.
-    Messenger_i messenger_servant;
+    PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
+      poa->activate_object( messenger_servant.in() );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
index 137230f1c26..f5699cb9686 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
@@ -34,6 +34,6 @@ CORBA::Boolean Messenger_i::send_message (
   std::ostringstream ostr;
   ostr << "Message handled on thread " << ACE_Thread::self();
   message = CORBA::string_dup(ostr.str().c_str());
-  return 1;
+  return true;
 }
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/run_test.pl b/TAO/DevGuideExamples/Multithreading/ThreadPool/run_test.pl
index 0bb35c7e33c..a73ce34a799 100755
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/run_test.pl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/run_test.pl
@@ -15,7 +15,7 @@ unlink $ior;
 
 print STDOUT "Starting MessengerServer\n";
 
-$S = new PerlACE::Process("MessengerServer", "-ORBEndpoint iiop://localhost");
+$S = new PerlACE::Process("MessengerServer", "-ORBListenEndpoints iiop://localhost");
 $S->Spawn();
 
 if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
index 7c952de272a..0a383f256c1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
@@ -57,10 +57,10 @@ ClientInterceptor::send_request (
 
   ACE_OS::strcpy (reinterpret_cast<char*> (buf), user_name);
 
-  sc.context_data.replace (string_len, string_len, buf, 1);
+  sc.context_data.replace (string_len, string_len, buf, true);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0);
+  ri->add_request_service_context (sc, false);
 
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
index bc1cfd78d0f..bbfb7aab4e2 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
@@ -12,13 +12,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      temp_initializer = new ClientInitializer;
-
       PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+        new ClientInitializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
index 21fdc9d783f..162ff20e7cd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
@@ -14,12 +14,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      ServerInitializer *temp_initializer = 0;
-
-      temp_initializer = new ServerInitializer;
-
       PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+        new ServerInitializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
@@ -35,10 +31,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       mgr->activate();
 
       // Create an object
-      Messenger_i messenger_servant;
+      PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
       PortableServer::ObjectId_var oid =
-        poa->activate_object( &messenger_servant );
+        poa->activate_object( messenger_servant.in());
       CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
 
       CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
index 36f5613c087..4cdf3098c47 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
@@ -35,6 +35,6 @@ CORBA::Boolean Messenger_i::send_message (
   std::cerr << "Message from: " << user_name << std::endl;
   std::cerr << "Subject:      " << subject << std::endl;
   std::cerr << "Message:      " << message << std::endl;
-  return 1;
+  return true;
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
index bb8a55b1b8a..e015f52a7b1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
@@ -4,10 +4,12 @@
 #define SERVERINITIALIZER_H
 
 #include "tao/PortableInterceptorC.h"
+#include "tao/LocalObject.h"
 #include "tao/PI/PI.h"
 
 class ServerInitializer :
-public virtual PortableInterceptor::ORBInitializer
+public virtual PortableInterceptor::ORBInitializer,
+public virtual CORBA::LocalObject
 {
  public:
   ServerInitializer ();
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/run_test.pl b/TAO/DevGuideExamples/PortableInterceptors/Auth/run_test.pl
index 99c179c46cc..2b479ea579c 100755
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/run_test.pl
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 
 # start MessengerServer
 my($iorfile) = 'Messenger.ior';
+unlink($iorfile);
+
 $S = new PerlACE::Process("MessengerServer");
 $S->Spawn();
 if (PerlACE::waitforfile_timed (
@@ -31,6 +33,7 @@ if ($C->SpawnWaitKill(15) != 0) {
 
 # clean-up 
 $S->Kill();
+unlink($iorfile);
 
 exit 0;
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
index 37e08c681e0..cec3d86ddf5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
@@ -82,11 +82,10 @@ ClientInterceptor::send_request (
   CORBA::Any gid_as_any;
   gid_as_any <<= gid;
 
-  sc.context_data = reinterpret_cast<CORBA::OctetSeq&>(
-                                         *codec->encode(gid_as_any));
+  sc.context_data = *codec->encode(gid_as_any);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0);
+  ri->add_request_service_context (sc, false);
 
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
index 38711aa1414..1d743cad3fe 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
@@ -11,13 +11,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      temp_initializer = new ClientInitializer;
-
       PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+        new ClientInitializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
index e792d7b5f4c..d4a23c6d70b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
@@ -13,11 +13,8 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
-    ServerInitializer *temp_initializer = 0;
-    temp_initializer = new ServerInitializer;
-
     PortableInterceptor::ORBInitializer_var orb_initializer =
-      temp_initializer;
+      new ServerInitializer;
 
     PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
@@ -33,12 +30,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create an object
-    Messenger_i messenger_servant;
+    PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
+      poa->activate_object( messenger_servant.in() );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index 1cdd6851662..889a6659d3f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -58,8 +58,14 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       uid_as_any = *(codec->decode(user_name));
 
       CORBA::Long uid;
-      uid_as_any >>= uid;
-      std::cout << "UID: " << uid << std::endl;
+      if (uid_as_any >>= uid)
+        {
+          std::cout << "UID: " << uid << std::endl;
+        }
+      else
+        {
+          std::cerr << "Could not extract UID from any." << std::endl;
+        }
 
     }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
index 283a13d504e..42bb29ef004 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
@@ -17,7 +17,6 @@ void
 ServerIORInterceptor::establish_components (
                                             PortableInterceptor::IORInfo_ptr info)
 {
-
   const char * permission = "ServerRequiresAuth";
 
   // arbitrary tag.
@@ -37,3 +36,23 @@ ServerIORInterceptor::establish_components (
 
   std::cout << "Created Tagged IOR." << std::endl;
 }
+
+void
+ServerIORInterceptor::components_established (
+          PortableInterceptor::IORInfo_ptr /*info*/)
+{
+}
+
+void
+ServerIORInterceptor::adapter_manager_state_changed (
+                             const char* /*id*/, 
+                             PortableInterceptor::AdapterState /*state*/)
+{
+}
+
+void
+ServerIORInterceptor::adapter_state_changed (
+    const PortableInterceptor::ObjectReferenceTemplateSeq& /*templates*/,
+    PortableInterceptor::AdapterState /*state*/)
+{
+}
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
index 920bcfd0f0e..169e117664c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
@@ -2,11 +2,10 @@
 
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
-#include "tao/IORInterceptor_Adapter.h"
 #include "tao/IORInterceptor/IORInterceptor.h"
 
 class ServerIORInterceptor :
-public virtual PortableInterceptor::IORInterceptor,
+public virtual PortableInterceptor::IORInterceptor_3_0,
 public virtual ::CORBA::LocalObject
 {
  public:
@@ -14,27 +13,15 @@ public virtual ::CORBA::LocalObject
 
   virtual void destroy ();
 
-  virtual void establish_components (
-                                     PortableInterceptor::IORInfo_ptr info
-                                     );
+  virtual void establish_components (PortableInterceptor::IORInfo_ptr info);
 
-  virtual void components_established (
-    PortableInterceptor::IORInfo_ptr /*info*/
-    )
-  {
-  }
+  virtual void components_established (PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
-    PortableInterceptor::AdapterManagerId /*id*/,
-    PortableInterceptor::AdapterState /*state*/
-    )
-  {
-  }
+    const char* id,
+    PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
-    const PortableInterceptor::ObjectReferenceTemplateSeq& /*templates*/,
-    PortableInterceptor::AdapterState /*state*/
-    )
-  {
-  }
+    const PortableInterceptor::ObjectReferenceTemplateSeq& templates,
+    PortableInterceptor::AdapterState state);
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
index ac822d2b392..1554e33cbe9 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
@@ -67,19 +67,26 @@ ServerInterceptor::receive_request (
                                             sc->context_data.length(),
                                             sc->context_data.length(),
                                             sc->context_data.get_buffer(),
-                                            0);
+                                            false);
 
     CORBA::Any gid_as_any;
     gid_as_any = *codec->decode(ocSeq);
 
     CORBA::Long gid;
-    gid_as_any >>= gid;
-    for (int i=0; i<3; ++i) {
-      if ( gid == allowed_gid[i] )
-        {
-          permission_granted = true;
-  }
-    }
+    if (gid_as_any >>= gid)
+      {
+        for (int i=0; i<3; ++i) {
+          if ( gid == allowed_gid[i] )
+            {
+              permission_granted = true;
+            }
+        }
+      }
+    else
+      {
+        permission_granted = false;
+        std::cerr << "Could not extract GID from any." << std::endl;
+      }
   }
 
   if (permission_granted == true) {
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index 2585bbc7d72..2945d4b3816 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -47,7 +47,7 @@ ClientInitializer::set_slot_data (void)
 {
   // Set the recursion flag
   CORBA::Any flag;
-  CORBA::Boolean x = 0;
+  CORBA::Boolean x = false;
   flag <<= CORBA::Any::from_boolean(x);
   current_->set_slot(slot_, flag);
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
index 538ec6d1bdf..9b8850a173c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
@@ -61,29 +61,32 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
 
   ACE_OS::strcpy (reinterpret_cast<char*> (buf), user_name);
 
-  sc.context_data.replace (string_len, string_len, buf, 1);
+  sc.context_data.replace (string_len, string_len, buf, true);
 
   // recursive call setup
   CORBA::Any *recurse = ri->get_slot(slot);
   CORBA::Boolean x;
-  *recurse >>= CORBA::Any::to_boolean(x);
-
   CORBA::Any flag;
-  if (x == 0)
-    {
-      x = 1;
-      flag <<= CORBA::Any::from_boolean(x);
-
-      pic->set_slot(slot, flag);
-
-      // get server time
-      std::cout << "Server Time = " << messenger->get_time() << std::endl;
-    }
+  if (*recurse >>= CORBA::Any::to_boolean(x)) {
+    if (x == false)
+      {
+        x = true;
+        flag <<= CORBA::Any::from_boolean(x);
+
+        pic->set_slot(slot, flag);
+
+        // get server time
+        std::cout << "Server Time = " << messenger->get_time() << std::endl;
+      }
+  } else {
+    std::cerr << "Could not extract a boolean value from any" << std::endl;
+  }
+     
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0);
+  ri->add_request_service_context (sc, false);
 
   // reset recursion test
-  x = 0;
+  x = false;
   flag <<= CORBA::Any::from_boolean(x);
   pic->set_slot(slot,flag);
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
index 7f6034193a7..45871eda26c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
@@ -16,12 +16,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      ServerInitializer *temp_initializer = 0;
-
-      temp_initializer = new ServerInitializer;
-
       PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+        new ServerInitializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
@@ -37,10 +33,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       mgr->activate();
 
       // Create an object
-      Messenger_i messenger_servant;
+      PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
       PortableServer::ObjectId_var oid =
-        poa->activate_object( &messenger_servant );
+        poa->activate_object( messenger_servant.in() );
       CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
 
       CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
index ba67cdb8ef6..c2f9473e3ef 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
@@ -35,7 +35,7 @@ CORBA::Boolean Messenger_i::send_message (
   std::cerr << "Message from: " << user_name << std::endl;
   std::cerr << "Subject:      " << subject << std::endl;
   std::cerr << "Message:      " << message << std::endl;
-  return 1;
+  return true;
 }
 
 char * Messenger_i::get_time (void)
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
index 443e4432a05..ce2a66ddb01 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
@@ -65,11 +65,10 @@ ClientInterceptor::send_request (
   CORBA::Any gid_as_any;
   gid_as_any <<= gid;
 
-  sc.context_data = reinterpret_cast<CORBA::OctetSeq&> (
-                                         *codec->encode(gid_as_any));
+  sc.context_data = *codec->encode(gid_as_any);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0);
+  ri->add_request_service_context (sc, false);
 
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
index 85af6d0c712..599126a385f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
@@ -12,13 +12,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      temp_initializer = new ClientInitializer;
-
       PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+        new ClientInitializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
index 66c731f89e3..c1efbd4172b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
@@ -14,12 +14,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      ServerInitializer *temp_initializer = 0;
-
-      temp_initializer = new ServerInitializer;
-
       PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+        new ServerInitializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
@@ -35,12 +31,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       mgr->activate();
 
       // Create an object
-      Messenger_i messenger_servant;
+      PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
       // Register the servant with the RootPOA, obtain its object
       // reference, stringify it, and write it to a file.
       PortableServer::ObjectId_var oid =
-        poa->activate_object( &messenger_servant );
+        poa->activate_object( messenger_servant.in() );
       CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
       CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
       std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index 9b54a07e441..e95806dcf84 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -58,8 +58,11 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       uid_as_any = *(codec->decode(user_name));
 
       CORBA::Long uid;
-      uid_as_any >>= uid;
-      std::cout << "UID: " << uid << std::endl;
+      if (uid_as_any >>= uid) {
+        std::cout << "UID: " << uid << std::endl;
+      } else {
+        std::cerr << "Could not extract UID from any." << std::endl;
+      }
 
     }
   catch(...)
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
index af730ae24c5..bb113f93d2c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
@@ -67,19 +67,23 @@ ServerInterceptor::receive_request (
                                             sc->context_data.length(),
                                             sc->context_data.length(),
                                             sc->context_data.get_buffer(),
-                                            0);
+                                            false);
 
     CORBA::Any gid_as_any;
     gid_as_any = *codec->decode(ocSeq);
 
     CORBA::Long gid;
-    gid_as_any >>= gid;
-    for (int i=0; i<3; ++i) {
-      if ( gid == allowed_gid[i] )
-        {
-          permission_granted = true;
-  }
-    }
+    if (gid_as_any >>= gid) {
+      for (int i=0; i<3; ++i) {
+        if ( gid == allowed_gid[i] )
+          {
+            permission_granted = true;
+          }
+       }
+     } else {
+       permission_granted = false;
+       std::cerr << "Could not extract GID from any." << std::endl;
+     }
   }
 
   if (permission_granted == true) {
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl
index 99c179c46cc..2b479ea579c 100755
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 
 # start MessengerServer
 my($iorfile) = 'Messenger.ior';
+unlink($iorfile);
+
 $S = new PerlACE::Process("MessengerServer");
 $S->Spawn();
 if (PerlACE::waitforfile_timed (
@@ -31,6 +33,7 @@ if ($C->SpawnWaitKill(15) != 0) {
 
 # clean-up 
 $S->Kill();
+unlink($iorfile);
 
 exit 0;
 
diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
index 6ee50964e5e..cafb18fc4b3 100644
--- a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
@@ -52,8 +52,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     RTCORBA::ThreadpoolId threadpool_id =
       rt_orb->create_threadpool_with_lanes (0,  // Stack Size
                                             lanes,
-                                            0,  // Allow borrowing
-                                            0,  // Allow request buffering
+                                            false,  // Allow borrowing
+                                            false,  // Allow request buffering
                                             0,  // Max buffered requests
                                             0); // Max request buffer size
 
@@ -71,12 +71,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                      poa_policy_list);
 
     // Create an object
-    Messenger_i messenger_servant(orb.in());
+    PortableServer::Servant_var<Messenger_i> messenger_servant
+      = new Messenger_i(orb.in());
 
     // Register the servant with the RootPOA, obtain its object
     // reference, stringify it, and write it to a file.
     PortableServer::ObjectId_var oid =
-      client_propagated_poa->activate_object( &messenger_servant );
+      client_propagated_poa->activate_object( messenger_servant.in() );
     CORBA::Object_var messenger_obj =
       client_propagated_poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
index d3a1079ec09..2f66e7d7fd5 100644
--- a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
@@ -34,6 +34,6 @@ Messenger_i::send_message (const char* user_name,
     std::cout << "Native Priority: " << native_priority  << std::endl;
   }
   std::cout << "Message:         " << message   << std::endl << std::endl;
-  return 1;
+  return true;
 }
 
diff --git a/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp b/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
index 4ff3a53265b..f3f818cc430 100644
--- a/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
@@ -21,11 +21,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
     mgr->activate();
 
     // Create a Logger_i servant.
-    Logger_i logger_servant;
+    PortableServer::Servant_var<Logger_i> logger_servant = new Logger_i;
 
     // Register the servant with the RootPOA, obtain its object reference,
     // stringify it, and write it to a file.
-    PortableServer::ObjectId_var oid = poa->activate_object(&logger_servant);
+    PortableServer::ObjectId_var oid = poa->activate_object(logger_servant.in());
     CORBA::Object_var logger_obj = poa->id_to_reference(oid.in());
     CORBA::String_var str = orb->object_to_string(logger_obj.in());
     std::ofstream iorFile("Logger.ior");
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
index af83c40edea..88b4c38bf35 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
@@ -22,6 +22,6 @@ CORBA::Boolean Logger_i::log_message (const char * message)
   log_time_string[24] = '\0';
   log_file << ACE_TEXT_ALWAYS_CHAR(log_time_string.c_str()) << " "
            << message << std::endl;
-  return 1;
+  return true;
 }
 
diff --git a/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp b/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
index 3016e53eb44..b332e2ca65a 100644
--- a/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
@@ -19,11 +19,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     mgr->activate();
 
     // Create an object
-    Messenger_i messenger_servant;
+    PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
 
     // Write its strigified reference to a file
     PortableServer::ObjectId_var oid =
-      poa->activate_object( &messenger_servant );
+      poa->activate_object( messenger_servant.in() );
     CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
     CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
     std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
index 08c2ad7fa96..647e169df59 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
@@ -29,6 +29,6 @@ CORBA::Boolean Messenger_i::send_message (
   std::cerr << "Message from: " << user_name << std::endl;
   std::cerr << "Subject:      " << subject << std::endl;
   std::cerr << "Message:      " << message << std::endl;
-  return 1;
+  return true;
 }
 
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
index b6f092d0187..47fbffe5365 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
@@ -79,10 +79,10 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
 
   PortableServer::POAManager_var poaman = poa->the_POAManager();
 
-  Transaction_i svt;
+  PortableServer::Servant_var<Transaction_i> svt = new Transaction_i;
 
   {
-    PortableServer::ObjectId_var id = poa->activate_object(&svt);
+    PortableServer::ObjectId_var id = poa->activate_object(svt.in());
     obj = poa->id_to_reference(id.in());
     CORBA::String_var ior = orb->object_to_string(obj.in());
     write_ior(ior.in());
@@ -94,7 +94,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
 
   orb->run();
 
-  poa->destroy(1, 1);
+  poa->destroy(true, true);
   orb->destroy();
 
   return 0;
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
index 1ea1f9370da..35529dbf768 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
@@ -21,12 +21,9 @@ MessageImpl::MessageImpl
  const char* user,
  const char* subject,
  const char* txt
- )
+ ) : OBV_Message(Message::AddrList(), user, subject, txt)
 {
   addAddress(address);
-  user_(user);
-  subject_(subject);
-  text_(txt);
 }
 
 Message::AddrList* MessageImpl::getAddresses() {
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
index 68531b56a8e..e59b0c2ba87 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
@@ -28,9 +28,9 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
 
   PortableServer::POAManager_var poaman = poa->the_POAManager();
 
-  Messenger_i svt;
+  PortableServer::Servant_var<Messenger_i> svt = new Messenger_i;
 
-  PortableServer::ObjectId_var id = poa->activate_object(&svt);
+  PortableServer::ObjectId_var id = poa->activate_object(svt.in());
   obj = poa->id_to_reference(id.in());
   CORBA::String_var ior = orb->object_to_string(obj.in());
   write_ior(ior.in());
@@ -41,7 +41,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
 
   orb->run();
 
-  poa->destroy(1, 1);
+  poa->destroy(true, true);
   orb->destroy();
 
   return 0;
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
index 8d295f17be7..3dc5a20807e 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
@@ -21,6 +21,6 @@ CORBA::Boolean Messenger_i::send_message (Message*& msg)
   msg->subject(out.str().c_str());
   msg->text("Ok. I'm on my way.");
 
-  return 1;
+  return true;
 }