Merged revisions 81316,81319-81321,81330 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r81316 | sma | 2008-04-10 03:14:50 -0500 (Thu, 10 Apr 2008) | 1 line
  
  ChangeLogTag: Thu Apr 10 08:15:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
........
  r81319 | johnnyw | 2008-04-10 06:31:40 -0500 (Thu, 10 Apr 2008) | 1 line
  
  Thu Apr 10 11:29:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81320 | johnnyw | 2008-04-10 06:43:25 -0500 (Thu, 10 Apr 2008) | 1 line
  
  Thu Apr 10 11:42:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81321 | johnnyw | 2008-04-10 07:43:22 -0500 (Thu, 10 Apr 2008) | 1 line
  
  Thu Apr 10 12:42:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81330 | iliyan | 2008-04-10 17:42:16 -0500 (Thu, 10 Apr 2008) | 1 line
  
  ChangeLogTag: Thu Apr 10 22:40:22 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........

20 files changed, 117 insertions, 70 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 892a382f088..d41333a5793 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,55 @@
+Thu Apr 10 22:40:22 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/ORB.cpp:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.cpp:
+        * tao/TAO_Internal.cpp:
+
+          Eliminating the typedef for
+          ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt>.
+
+Thu Apr 10 12:42:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CodeSets/simple/run_test.pl:
+          Fixed bug in add_lib_paths
+
+Thu Apr 10 11:42:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+          Fixed invalid delete
+
+Thu Apr 10 11:29:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Object_Map.{h,cpp}:
+          Use an auto_ptr to store the members, simplifies our code
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.{h,cpp}:
+          Don't use an auto_ptr in the constructor, just use it as member. This was
+          a left over of emulated exception support, thanks to Jeff Parsons
+          for finding this
+
+        * tao/Transport.cpp:
+          Layout change
+
+Thu Apr 10 08:15:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp:
+
+          Another "interface" VC8 MFC conflict.
+
+        * tests/DII_AMI_Forward/DII_AMI_Forward.mpc:
+
+          VC8 multi-build conflict (both server + client) over the test.idl
+
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp:
+
+          Place this specialised UUID class into it's own TAO_FtRt namespace.
+
 Wed Apr  9 18:01:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Default_Thread_Lane_Resources_Manager.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 4dc2d3e3ff5..91763997d4d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -43,7 +43,7 @@ namespace FTRTEC {
         --argc; ++argv;
         if (argv[0][0] == '-') continue;
         else if (argv[0][0] != '$') {
-          UUID uuid(argv[0]);
+          TAO_FtRt::UUID uuid(argv[0]);
           if (!uuid.is_valid())
             ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1);
           object_id_.length(16);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index 6c63a849077..edea0f058e6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -45,8 +45,8 @@ Request_Context_Repository::init(CORBA::ORB_ptr the_orb)
 void Request_Context_Repository::generate_object_id(
   FtRtecEventChannelAdmin::ObjectId& oid)
 {
-  oid.length(sizeof(UUID));
-  UUID::create(oid.get_buffer());
+  oid.length(sizeof(TAO_FtRt::UUID));
+  TAO_FtRt::UUID::create(oid.get_buffer());
   set_object_id(oid);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index c64a9891525..0fbc19919d8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -192,7 +192,7 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa)
 
   FtRtecEventComm::ObjectId oid;
   oid.length(16);
-  UUID::create(oid.get_buffer());
+  TAO_FtRt::UUID::create(oid.get_buffer());
 
   RtecEventChannelAdmin::EventChannel_var gateway;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index cc29c3345c5..4a1632fa931 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (Utils,
 #endif /* __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+namespace TAO_FtRt
+{
 
 static union
 {
@@ -163,5 +165,5 @@ UUID::create (unsigned char *buffer)
 
   ACE_OS::memcpy(buffer + 10, &node, 6);
 }
-
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
index 19b81c44354..298a14e20c2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -31,6 +31,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+namespace TAO_FtRt
+{
 /**
  * This is an implementation of Global Unique Identifier
  * which follows the document draft-leach-uuids-guids-01.txt. The
@@ -112,7 +114,7 @@ class TAO_FtRtEvent_Export  UUID
       unsigned char uuid[BINRARY_LENGTH];
     } rep_;
 };
-
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
index a94affd5dd5..0a7a87bc9b9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+namespace TAO_FtRt
+{
 
 ACE_INLINE
 UUID::UUID()
@@ -54,5 +56,5 @@ void UUID::to_string(ACE_CString& string) const
   string.resize(STRING_LENGTH-1);
   this->to_string(&string[0]);
 }
-
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index 0fb7d2c70bf..1f754d71b06 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -19,16 +19,16 @@ template<class Interface> typename RIR_Narrow<Interface>::Interface_ptr
 RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
                                 const char *object_id)
 {
-  Interface_var interface;
+  Interface_var intface;
 
   try
     {
       CORBA::Object_var object =
         orb->resolve_initial_references (object_id);
 
-      interface = Interface::_narrow (object.in ());
+      intface = Interface::_narrow (object.in ());
 
-      if (CORBA::is_nil (interface.in ()))
+      if (CORBA::is_nil (intface.in ()))
         {
           ACE_ERROR ((LM_ERROR,
                       "Panic - error while narrowing <%s>\n",
@@ -38,7 +38,7 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
     } catch (const CORBA::Exception& ex) {
       ex._tao_print_exception ("Caught an exception \n");
     }
-  return interface._retn ();
+  return intface._retn ();
 }
 
 #endif /* TAO_PERF_RTEC_RIR_NARROW_CPP */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 7723f33cdca..767d6c6e7ae 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -52,7 +52,7 @@ namespace TAO
 
   DII_Invocation_Adapter::~DII_Invocation_Adapter (void)
   {
-    delete ex_data_;
+    delete[] ex_data_;
   }
 
   void
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index b25ddc05d55..f527376706b 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1239,7 +1239,7 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orbid)
     // Use this string variable to hold the configuration identity key
   ACE_CString orbconfig_string;
   TAO::parse_orb_opt (command_line, ACE_TEXT("-ORBGestalt"), orbconfig_string);
-  ACE_Service_Gestalt_Auto_Ptr gestalt = TAO::find_orb_context (orbconfig_string);
+  ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> gestalt = TAO::find_orb_context (orbconfig_string);
 
   // An ORB corresponding to the desired ORBid doesn't exist so create
   // a new one.
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 584c03d0f8b..c2e4e3f22d5 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -181,7 +181,7 @@ TAO_ORB_Core_Static_Resources::operator=(const TAO_ORB_Core_Static_Resources& ot
 // ****************************************************************
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid,
-                            ACE_Service_Gestalt_Auto_Ptr gestalt)
+                            ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> gestalt)
   : protocols_hooks_ (0),
     network_priority_protocols_hooks_ (0),
 #if TAO_USE_LOCAL_MEMORY_POOL == 1
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 7d5863ece86..251434df1b3 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -165,7 +165,7 @@ class TAO_Export TAO_ORB_Core
 public:
 
   /// Constructor.
-  TAO_ORB_Core (const char* id, ACE_Service_Gestalt_Auto_Ptr g);
+  TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g);
 
   /// Accessor for the ORB parameters.
   TAO_ORB_Parameters *orb_params (void);
@@ -1230,7 +1230,7 @@ protected:
   TAO_Codeset_Manager *codeset_manager_;
 
   /// ORB's service configuration
-  ACE_Service_Gestalt_Auto_Ptr config_;
+  ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> config_;
 
   /// The hook to be set for the SyncScopePolicy
   Sync_Scope_Hook sync_scope_hook_;
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 65b28d42ea7..c2fbdfd7603 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -299,12 +299,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
 
   // Finally everything is fine.  Make sure to take ownership away
   // from the auto pointer.
-  this->id_uniqueness_strategy_ = new_id_uniqueness_strategy.release ();
-  this->lifespan_strategy_ = new_lifespan_strategy.release ();
-  this->id_assignment_strategy_ = new_id_assignment_strategy.release ();
-  this->id_hint_strategy_ = new_id_hint_strategy.release ();
-  this->servant_map_ = new_servant_map.release ();
-  this->user_id_map_ = new_user_id_map.release ();
+  this->id_uniqueness_strategy_ = new_id_uniqueness_strategy;
+  this->lifespan_strategy_ =  new_lifespan_strategy;
+  this->id_assignment_strategy_ = new_id_assignment_strategy;
+  this->id_hint_strategy_ = new_id_hint_strategy;
+  this->servant_map_ = new_servant_map;
+  this->user_id_map_ = new_user_id_map;
 }
 
 TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
@@ -319,13 +319,6 @@ TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
       user_id_map::value_type map_entry = *iterator;
       delete map_entry.second ();
     }
-
-  delete this->id_uniqueness_strategy_;
-  delete this->lifespan_strategy_;
-  delete this->id_assignment_strategy_;
-  delete this->id_hint_strategy_;
-  delete this->servant_map_;
-  delete this->user_id_map_;
 }
 
 bool
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index dee8dcdd946..e8922b3f874 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -25,6 +25,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "ace/Map_T.h"
+#include "ace/Auto_Ptr.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -207,22 +208,22 @@ public:
 #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
 
   /// Id map.
-  user_id_map *user_id_map_;
+  auto_ptr<user_id_map> user_id_map_;
 
   /// Servant map.
-  servant_map *servant_map_;
+  auto_ptr<servant_map> servant_map_;
 
   /// Id uniqueness strategy.
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy_;
+  auto_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_;
 
   /// Lifespan strategy.
-  TAO_Lifespan_Strategy *lifespan_strategy_;
+  auto_ptr<TAO_Lifespan_Strategy> lifespan_strategy_;
 
   /// Id assignment strategy.
-  TAO_Id_Assignment_Strategy *id_assignment_strategy_;
+  auto_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_;
 
   /// Id hint strategy.
-  TAO_Id_Hint_Strategy *id_hint_strategy_;
+  auto_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_;
 
   /// Flag to see if we are using active maps in this active object
   /// map.
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index d4f061e4023..401a2b94aa1 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -18,7 +18,6 @@
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/Active_Object_Map.h"
 #include "tao/PortableServer/Active_Object_Map_Entry.h"
-#include "ace/Auto_Ptr.h"
 
 ACE_RCSID (PortableServer,
            Servant_Retention_Strategy,
@@ -32,7 +31,7 @@ namespace TAO
   {
     ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) :
       ServantRetentionStrategyNonRetain (),
-      active_object_map_ (0),
+      active_object_map_ (),
       waiting_servant_deactivation_ (0)
     {
     }
@@ -51,31 +50,18 @@ namespace TAO
                                                poa->orb_core().server_factory ()->active_object_map_creation_parameters ()
                                               ), CORBA::NO_MEMORY ());
 
-      // Give ownership of the new map to the auto pointer.  Note, that it
-      // is important for the auto pointer to take ownership before
-      // checking for exception since we may need to delete the new map.
-      auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
-
-      // Check for exception in construction of the active object map.
-
-      // Finally everything is fine.  Make sure to take ownership away
-      // from the auto pointer.
-      this->active_object_map_ = new_active_object_map.release ();
+      ACE_auto_ptr_reset (this->active_object_map_, active_object_map);
     }
 
     void
     ServantRetentionStrategyRetain::strategy_cleanup(void)
     {
-      // Delete the active object map.
-      delete this->active_object_map_;
-      active_object_map_ = 0;
     }
 
     void
     ServantRetentionStrategyRetain::deactivate_object (
       const PortableServer::ObjectId &id)
     {
-
       TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
       int const result = this->active_object_map_->
         find_entry_using_user_id (id, active_object_map_entry);
@@ -104,8 +90,7 @@ namespace TAO
         {
           this->poa_->servant_deactivated_hook (
             active_object_map_entry->servant_,
-            active_object_map_entry->user_id_
-           );
+            active_object_map_entry->user_id_);
         }
 
       if (new_count == 0)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index a805a6bb096..3aec667156e 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -20,6 +20,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Auto_Ptr.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
@@ -93,8 +95,7 @@ namespace TAO
         PortableServer::Servant servant);
 
       virtual
-      CORBA::Object_ptr
-      servant_to_reference (PortableServer::Servant servant);
+      CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant);
 
       virtual
       CORBA::Object_ptr create_reference (
@@ -140,7 +141,7 @@ namespace TAO
         const PortableServer::ObjectId &user_id);
 
     private:
-      TAO_Active_Object_Map *active_object_map_;
+      auto_ptr<TAO_Active_Object_Map> active_object_map_;
       CORBA::ULong waiting_servant_deactivation_;
     };
   }
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index bf01050c48b..ffe45b8f615 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -124,13 +124,13 @@ namespace
      * Initialize ORB-local (private) ACE Service Configurator
      * repository.
      *
-     * @return @c 0 if successful, @c -1 with @c errno set if failure.
-     *
-     */
-    int open_private_services_i (ACE_Service_Gestalt_Auto_Ptr pcfg,
-                                 int & argc,
-                                 char ** argv,
-                                 bool skip_service_config_open = false,
+   * @return @c 0 if successful, @c -1 with @c errno set if failure.
+   *
+   */
+  int open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
+                               int & argc,
+                               char ** argv,
+                               bool skip_service_config_open = false,
                                  bool ignore_default_svc_conf_file = false);
 
     /**
@@ -453,7 +453,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
 }
 
 int
-TAO::ORB::close_services (ACE_Service_Gestalt_Auto_Ptr pcfg)
+TAO::ORB::close_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg)
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                             guard,
@@ -485,7 +485,7 @@ namespace
   /// Open services, belonging to the gestalt instance.
 
   int
-  open_private_services_i (ACE_Service_Gestalt_Auto_Ptr pcfg,
+  open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
                            int & argc,
                            char ** argv,
                            bool skip_service_config_open,
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 8ee78ef946b..0cacbec7f45 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -450,8 +450,7 @@ TAO_Transport::recache_transport (TAO_Transport_Descriptor_Interface *desc)
   this->purge_entry ();
 
   // Then add ourselves to the cache
-  return this->transport_cache_manager ().cache_transport (desc,
-                                                           this);
+  return this->transport_cache_manager ().cache_transport (desc, this);
 }
 
 int
diff --git a/TAO/tests/CodeSets/simple/run_test.pl b/TAO/tests/CodeSets/simple/run_test.pl
index 7e4c20defbb..c58263d23a0 100755
--- a/TAO/tests/CodeSets/simple/run_test.pl
+++ b/TAO/tests/CodeSets/simple/run_test.pl
@@ -8,8 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-PerlACE::add_lib_path ('../lib/IBM1047_ISO8859/.');
-PerlACE::add_lib_path ('../lib/UCS4_UTF16/.');
+PerlACE::add_lib_path ('../libs/IBM1047_ISO8859/.');
+PerlACE::add_lib_path ('../libs/UCS4_UTF16/.');
 
 $iorfile = PerlACE::LocalFile ("server.ior");
 unlink $iorfile;
diff --git a/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc b/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
index f134a899929..7841eb4a9ed 100644
--- a/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
+++ b/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
@@ -2,17 +2,27 @@
 // $Id$
 //
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1;
+}
 
 project (*Client): taoclient, dynamicinterface {
+  after += *idl
   Source_Files {
     client.cpp
     DII_ReplyHandler.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project (*Server): messaging, pi_server, taoserver, avoids_minimum_corba {
+  after += *idl
   IDL_Files {
-    test.idl
   }
 
   Source_Files {