This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

45 files changed, 5405 insertions, 2313 deletions

diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.cpp b/TAO/tao/PortableServer/AMH_Response_Handler.cpp
new file mode 100644
index 00000000000..b22c6deee0a
--- /dev/null
+++ b/TAO/tao/PortableServer/AMH_Response_Handler.cpp
@@ -0,0 +1,273 @@
+// $Id$
+
+#include "AMH_Response_Handler.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Transport.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "tao/Pluggable_Messaging.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+#include "tao/GIOP_Utils.h"
+#include "tao/debug.h"
+#include "tao/Buffer_Allocator_T.h"
+#include "ace/Copy_Disabled.h"
+
+TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
+  : mesg_base_ (0)
+  , request_id_ (0)
+  , transport_ (0)
+  , orb_core_ (0)
+  , argument_flag_ (1)
+  , exception_type_ (TAO_GIOP_NO_EXCEPTION)
+  , reply_status_ (TAO_RS_UNINITIALIZED)
+  , allocator_ (0)
+{
+}
+
+TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
+{
+  this->transport_->remove_reference ();
+
+  // Since we are destroying the object we put a huge lock around the
+  // whole destruction process (just paranoid).
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+
+    if (this->response_expected_ == 0) //oneway ?
+      {
+        return;
+      }
+
+    // If the ResponseHandler is being destroyed before a reply has
+    // been sent to the client, we send a system exception
+    // CORBA::NO_RESPONSE, with minor code to indicate the problem.
+    if (this->reply_status_ == TAO_RS_SENT)
+      {
+        return;
+      }
+
+    // If sending the exception to the client fails, then we just give
+    // up, release the transport and return.
+    ACE_DECLARE_NEW_CORBA_ENV;
+    ACE_TRY
+      {
+        CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code
+                               (TAO_AMH_REPLY_LOCATION_CODE,
+                                EFAULT),
+                               CORBA::COMPLETED_NO);
+        this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHALL
+      {
+      }
+    ACE_ENDTRY;
+    ACE_CHECK;
+  }
+}
+
+void
+TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request,
+                               TAO_AMH_BUFFER_ALLOCATOR* allocator)
+{
+  mesg_base_ = server_request.mesg_base_;
+  request_id_ = server_request.request_id_;
+  response_expected_  = server_request.response_expected_;
+  transport_ = server_request.transport ();
+  orb_core_ = server_request.orb_core ();
+  allocator_ = allocator;
+
+  this->transport_->add_reference ();
+}
+
+void
+TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    if (this->reply_status_ != TAO_RS_UNINITIALIZED)
+      {
+        // Looks like someone is trying to call an AMH method
+        // more than once
+        //
+        // We assume that the servant has already processed the
+        // request and is now trying to send back the reply.  Hence we
+        // say that the operation has completed but let the server
+        // anyway that it is not doing something right.
+        ACE_THROW (CORBA::BAD_INV_ORDER
+                          (CORBA::SystemException::_tao_minor_code
+                                  (TAO_AMH_REPLY_LOCATION_CODE,
+                                   EEXIST),
+                           CORBA::COMPLETED_YES));
+      }
+  }
+
+  // Construct our reply generator.
+  TAO_Pluggable_Reply_Params_Base reply_params;
+  reply_params.request_id_ = this->request_id_;
+  reply_params.service_context_notowned (&(this->reply_service_context_.service_info ()));
+  reply_params.argument_flag_ = this->argument_flag_;
+
+  if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
+    {
+      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
+    }
+  else
+    {
+      reply_params.reply_status_ = this->exception_type_;
+    }
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+
+    this->mesg_base_->generate_reply_header (this->_tao_out,
+                                             reply_params);
+
+    // We are done initialising the reply
+    this->reply_status_ = TAO_RS_INITIALIZED;
+  }
+
+}
+
+void
+TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL)
+{
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+
+    // If the reply has not been initialised, raise an exception to the
+    // server-app saying it is not doing something right.
+    if (this->reply_status_ != TAO_RS_INITIALIZED)
+      {
+        ACE_THROW (CORBA::BAD_INV_ORDER (
+                          CORBA::SystemException::_tao_minor_code (
+                                                  TAO_AMH_REPLY_LOCATION_CODE,
+                                                  ENOTSUP),
+                          CORBA::COMPLETED_YES));
+      }
+    this->reply_status_ = TAO_RS_SENDING;
+  }
+
+  // Send the message.
+  int result = this->transport_->send_message (this->_tao_out,
+                                               0,
+                                               TAO_Transport::TAO_REPLY);
+
+  if (result == -1)
+    {
+      if (TAO_debug_level > 0)
+        {
+          // No exception but some kind of error, yet a response
+          // is required.
+          ACE_ERROR ((
+                      LM_ERROR,
+                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"),
+                      ACE_TEXT ("TAO_AMH_Response_Handler::_tao_rh_send_reply")
+                      ));
+        }
+    }
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    this->reply_status_ = TAO_RS_SENT;
+  }
+}
+
+void
+TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
+                                                  ACE_ENV_ARG_DECL)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    if (this->reply_status_ != TAO_RS_UNINITIALIZED)
+      {
+        ACE_THROW (CORBA::BAD_INV_ORDER (
+                                         CORBA::SystemException::_tao_minor_code (
+                                                                                  TAO_AMH_REPLY_LOCATION_CODE,
+                                                                                  ENOTSUP),
+                                         CORBA::COMPLETED_YES));
+      }
+    this->reply_status_ = TAO_RS_SENDING;
+  }
+
+  TAO_Pluggable_Reply_Params_Base reply_params;
+  reply_params.request_id_ = this->request_id_;
+  reply_params.svc_ctx_.length (0);
+  reply_params.service_context_notowned (&this->reply_service_context_.service_info ());
+  reply_params.argument_flag_ = 1;
+  reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
+  // @@ It appears as if there should be a more efficient way to do
+  //    this: the caller already knows this because it is part of the
+  //    ExceptionHolder information.
+  if (CORBA::SystemException::_downcast (&ex))
+    reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
+
+  if (this->mesg_base_->generate_exception_reply (this->_tao_out,
+                                                  reply_params,
+                                                  ex) == -1)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  // Send the Exception
+  if (this->transport_->send_message (this->_tao_out,
+                                      0,
+                                      TAO_Transport::TAO_REPLY) == -1)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("TAO: (%P|%t|%N|%l):  ")
+                  ACE_TEXT ("TAO_AMH_Response_Handler: could not send exception reply\n")));
+    }
+
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    this->reply_status_ = TAO_RS_SENT;
+  }
+}
+
+void
+TAO_AMH_Response_Handler::_remove_ref (void)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX,
+               mon,
+               this->refcount_lock_);
+    
+    --this->refcount_;
+
+    if (this->refcount_ > 0)
+      return;
+  }
+
+  if (this->allocator_)
+    {
+      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_);
+
+      allocator.release(this);
+    }
+  else
+    {
+      delete this;
+    }
+
+  return;
+}
+
+namespace TAO
+{
+  void
+  ARH_Refcount_Functor::operator () (
+      TAO_AMH_Response_Handler *arh)
+    ACE_THROW_SPEC (())
+  {
+    (void) arh->_remove_ref ();
+  }
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.h b/TAO/tao/PortableServer/AMH_Response_Handler.h
new file mode 100644
index 00000000000..cd94fbab058
--- /dev/null
+++ b/TAO/tao/PortableServer/AMH_Response_Handler.h
@@ -0,0 +1,216 @@
+// -*- C++ -*-
+
+// =========================================================================
+/**
+ *  @file   AMH_Response_Handler.h
+ *
+ *  $Id$
+ *
+ *  @author Mayur Deshpande <mayur@ics.uci.edu>
+ *
+ */
+// =========================================================================
+
+#ifndef TAO_AMH_RESPONSE_HANDLER_H
+#define TAO_AMH_RESPONSE_HANDLER_H
+
+#include "portableserver_export.h"
+
+#include "tao/Allocator.h"
+#include "tao/Service_Context.h"
+#include "tao/CDR.h"
+#include "tao/LocalObject.h"
+#include "tao/Buffer_Allocator_T.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_Transport;
+class TAO_Pluggable_Messaging;
+class TAO_Output_CDR;
+class TAO_ORB_Core;
+class TAO_ServerRequest;
+class ACE_Allocator;
+
+typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
+
+/**
+ * @class TAO_AMH_Response_Handler
+ *
+ * @brief Class representing an Asynchronous-Method-Handling (AMH)
+ * ResponseHandler (RH) object.
+ *
+ * Class encapsulates state required to send a response back to the
+ * client independent of the thread that originally created the state
+ * on the activation-record.  Thus the required state (copied from
+ * TAO_Server_Request) is 'stored' on the heap.
+ *
+ * One RH is created for every client request and the RH can be used
+ * only once i.e.,  the asynchronous method can be called only once.
+ * This class also encapsulates various initialisation and
+ * response-sending functionality that is common to all RHs (generated
+ * by the IDL compiler). Thus the IDL-compiler has to generate less
+ * code which in turn reduces the overall code size for an
+ * application.
+ */
+class TAO_PortableServer_Export TAO_AMH_Response_Handler
+// @@ Mayur, this is not the correct way to use
+//    TAO_LocalRefCounted_Object.  Application code is supposed to use
+//    it when necessary.  You're forcing applications to use a
+//    reference counted version of their AMH_Response_Handler.  This
+//    isn't consistent with the specified semantics detailed in the
+//    CCM spec.  Please remove this and place it where appropriate in
+//    your AMH tests and examples.
+  : virtual public TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor
+  TAO_AMH_Response_Handler ();
+
+  /// Destructor
+  /**
+   * Releases the transport and in case of an error, sends the appropriate
+   * exception back to the client
+   */
+  virtual ~TAO_AMH_Response_Handler (void);
+
+  /**
+   * Stores necessary information from a TAO_Server_Request onto the heap
+   */
+  virtual void init(TAO_ServerRequest &server_request,
+                    TAO_AMH_BUFFER_ALLOCATOR* allocator);
+
+  /// @name Mutators for refcount
+  //@{
+  virtual void _remove_ref (void);
+  //@}
+
+protected:
+
+  /// Sets up the various parameters in anticipation of returning a reply
+  /// to the client. return/OUT/INOUT arguments are marshalled into the
+  /// Output stream after this method has been called.
+  void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Sends the marshalled reply back to the client.
+  void _tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL);
+
+  /// Send back an exception to the client.
+  void _tao_rh_send_exception (CORBA::Exception &ex
+                               ACE_ENV_ARG_DECL);
+
+protected:
+
+  /// The outgoing CDR stream
+  /**
+   * The IDL-generated ResponseHandler implementations used this field
+   * to marshal the response.
+   * Making it a field instead of a public accessor makes the code in
+   * the generated ResponseHandler implementation a lot more readable.
+   */
+  TAO_OutputCDR _tao_out;
+
+private:
+
+  // Private and undefined, standard C++ idiom to prohibit copying.
+  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&))
+  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&))
+
+private:
+  /// Pointer to the original message-base
+  TAO_Pluggable_Messaging *mesg_base_;
+
+  /// Copy of the request-id of the original Server-Request
+  CORBA::ULong request_id_;
+
+  CORBA::Boolean response_expected_;
+
+  /// Handle to transport through which the reply will be sent
+  /// Copy of transport in original Server_Request
+  TAO_Transport *transport_;
+
+  /// A pointer to the ORB Core for the context where the request was
+  /// created.
+  TAO_ORB_Core *orb_core_;
+
+  /// The reply service context
+  TAO_Service_Context reply_service_context_;
+
+  /// Alwyas set to true (we always have something to return to the
+  /// client
+  // @@ Mayur: I think not!  This is used to generate padding in GIOP
+  //    1.2 messages (where the payload must start on an 8-byte
+  //    boundary.  But some replys have no payload (only header), in
+  //    those cases you cannot insert the padding.  We need the
+  //    ResponseHandler to set this field correctly!
+  CORBA::Boolean argument_flag_;
+
+  //  TAO_GIOP_ReplyStatusType exception_type_;
+  /// Exception type (will be NO_EXCEPTION in the majority of the
+  /// cases).
+  // @@ Mayur: I do not think we need this one, we can deduce the type
+  //    of reply depending on the _tao_rh_*() method called.
+  CORBA::ULong exception_type_;
+
+  /**
+   * Various states the ResponseHandler can be in.
+   *
+   * These states represent various states the RH can be in and
+   * the states are used not only in implementing the 'once-only semantics of
+   * RHs, but in making sure well the call thread-safe as well.
+   */
+  enum Reply_Status
+    {
+      TAO_RS_UNINITIALIZED,
+      TAO_RS_INITIALIZED,
+      TAO_RS_SENDING,
+      TAO_RS_SENT
+    };
+  Reply_Status reply_status_;
+  // I would use the "state pattern"..
+  // Carlos, Isn't that an overkill?
+  // @@ Mayur: it depends on what form of the "State Pattern" you
+  //    use.  The more generic form, as described in GoF, uses a class
+  //    for each state, super-elegant but indeed a bit heavy handed.
+  //    The lighter-weight form (using a state variable
+
+  /// Mutex to ensure the AMH-RH method call is thread-safe.
+  ACE_SYNCH_MUTEX mutex_;
+
+  /// Allocator used to allocate this object. If zero then we are allocated
+  /// from the heap
+  TAO_AMH_BUFFER_ALLOCATOR* allocator_;
+};
+
+namespace TAO
+{
+  /**
+   * @class ARH_Refcount_Functor
+   *
+   * @brief Functor for refcounting of TAO_AMH_Response_Handler
+   *
+   * This is used to safely handle the destruction of
+   * TAO_AMH_Response_Handler objects which are created on the
+   * heap. We cannot use auto_ptr <> since it calls delete on the
+   * pointer, and calling delete on TAO_AMH_Response_Handler *
+   * will not work. Hence this functor will be used with Auto_Functor
+   * class to handle the memory safely.
+   *
+   * @todo Ideally, this class can be a generic class. But that
+   * requires quite a bit of cleanup within TAO to be more useful.
+   */
+  class TAO_PortableServer_Export ARH_Refcount_Functor
+  {
+  public:
+    void operator() (TAO_AMH_Response_Handler *arh)
+      ACE_THROW_SPEC (());
+  };
+
+}
+
+#endif /* TAO_AMH_RESPONSE_HANDLER_H */
diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl
new file mode 100644
index 00000000000..0817f88a146
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORT.pidl
@@ -0,0 +1,51 @@
+// -*- IDL -*-
+/**
+ * @file Default_ORT.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the TAO_Default_ORT module.
+ *
+ * This file is used to generate Default_ORTC.{h,i,cpp}, using the following
+ * command:
+ *
+ *   tao_idl.exe
+ *        -o orig -Ge 1 -GT -Sc
+ *        -I../..
+ *        -Wb,export_macro=TAO_PortableServer_Export \
+ *        -Wb,export_include="portableserver_export.h" \
+ *        -Wb,pre_include="ace/pre.h"
+ *        -Wb,post_include="ace/post.h"
+ *        Default_ORT.pidl
+ *
+ * and then:
+ *
+ * cp orig/Default_ORTC.{h,i,cpp} .
+ * patch < diffs/Default_ORT.diff
+ *
+ * The code left in Default_ORTC.{h,i,cpp} is
+ * ready for use.
+ *
+ *
+ * @note The diffs were generated using:
+ *
+ *   rm diffs/Default_ORT.diff
+ *   for i in Default_ORTC.{h,i,cpp}; do
+ *     diff -wub orig/$i $i >> diffs/Default_ORT.diff
+ *   done
+ */
+
+#ifndef TAO_DEFAULT_ORT_PIDL
+#define TAO_DEFAULT_ORT_PIDL
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate.pidl"
+
+module TAO_Default_ORT
+{
+  valuetype ObjectReferenceTemplate
+    : PortableInterceptor::ObjectReferenceTemplate
+  {
+  };
+};
+
+#endif /* TAO_DEFAULT_ORT_PIDL */
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
new file mode 100644
index 00000000000..030e2282cb1
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -0,0 +1,412 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:323
+
+
+#include "Default_ORTC.h"
+#include "tao/CDR.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/Typecode.h"
+#include "tao/Any_Impl_T.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "Default_ORTC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:64
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x44656661), 
+  ACE_NTOHL (0x756c745f), 
+  ACE_NTOHL (0x4f52542f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
+    24,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
+    0, // value modifier
+  CORBA::tk_null, // no stateful base valuetype
+
+0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
+    CORBA::tk_value,
+    sizeof (_oc_TAO_Default_ORT_ObjectReferenceTemplate),
+    (char *) &_oc_TAO_Default_ORT_ObjectReferenceTemplate,
+    0,
+    sizeof (TAO_Default_ORT::ObjectReferenceTemplate)
+  );
+
+namespace TAO_Default_ORT
+{
+  ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate =
+    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_add_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::add_ref (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_remove_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::remove_ref (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_release (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::remove_ref (p);
+}
+
+TAO_Default_ORT::ObjectReferenceTemplate *
+TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
+{
+  if (v == 0)
+    {
+      return 0;
+    }
+  
+  return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v);
+}
+
+const char *
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
+{
+  return this->_tao_obv_static_repository_id ();
+}
+
+void
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ObjectReferenceTemplate *_tao_tmp_pointer =
+    ACE_static_cast (
+        ObjectReferenceTemplate *,
+        _tao_void_pointer
+      );
+  CORBA::remove_ref (_tao_tmp_pointer);
+}
+
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm)
+{
+  return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
+}
+
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_InputCDR & strm)
+{
+  return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
+}
+
+CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
+    TAO_InputCDR &strm,
+    ObjectReferenceTemplate *&new_object
+  )
+{
+  CORBA::ValueBase *base = 0;
+  CORBA::ValueFactory_var factory;
+  CORBA::Boolean retval =
+    CORBA::ValueBase::_tao_unmarshal_pre (
+        strm,
+        factory.out (),
+        base,
+        ObjectReferenceTemplate::_tao_obv_static_repository_id ()
+      );
+  
+  if (retval == 0)
+    {
+      return 0;
+    }
+  
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
+          return 0;
+        }
+    }
+  
+  // Now base must be null or point to the unmarshaled object.
+  // Align the pointer to the right subobject.
+  new_object = ObjectReferenceTemplate::_downcast (base);
+  return retval;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
+{}
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &strm)
+{
+  return _tao_marshal_state (strm);
+}
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &strm)
+{
+  return _tao_unmarshal_state (strm);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+
+
+template<>
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
+}
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *_tao_elem
+  )
+{
+  CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate **_tao_elem
+  )
+{
+  TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::insert (
+      _tao_any,
+      TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+      TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::extract (
+        _tao_any,
+        TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor,
+        TAO_Default_ORT::_tc_ObjectReferenceTemplate,
+        _tao_elem
+      );
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:490
+
+void
+CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
+{
+  if (vt != 0)
+    {
+      vt->_add_ref ();
+    }
+}
+
+void
+CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
+{
+  if (vt != 0)
+    {
+      vt->_remove_ref ();
+    }
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
+CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &strm,
+    const TAO_Default_ORT::ObjectReferenceTemplate *_tao_valuetype
+  )
+{
+  return
+    CORBA::ValueBase::_tao_marshal (
+        strm,
+        ACE_const_cast (
+            TAO_Default_ORT::ObjectReferenceTemplate *,
+            _tao_valuetype
+          ),
+        (ptrdiff_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast
+      );
+}
+
+CORBA::Boolean
+operator>> (
+    TAO_InputCDR &strm,
+    TAO_Default_ORT::ObjectReferenceTemplate *&_tao_valuetype
+  )
+{
+  return TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (strm, _tao_valuetype);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/marshal_cs.cpp:44
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
+{
+  return (
+      1
+    );
+}
+
+CORBA::Boolean
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR &)
+{
+  return (
+    1
+  );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1628
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Value_Traits<
+        TAO_Default_ORT::ObjectReferenceTemplate
+      >;
+
+  template class
+    TAO_Value_Var_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+        
+      >;
+  
+  template class
+    TAO_Value_Out_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+        
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Value_Traits< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+      >
+
+# pragma instantiate \
+    TAO_Value_Var_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+        
+      >
+  
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+        
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
new file mode 100644
index 00000000000..5ec169a3ec4
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -0,0 +1,257 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:171
+
+#ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
+#define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace TAO_Default_ORT
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_valuetype.cpp:527
+  
+  
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
+  
+  class ObjectReferenceTemplate;
+  typedef
+    TAO_Value_Var_T<
+        ObjectReferenceTemplate
+      >
+    ObjectReferenceTemplate_var;
+  
+  typedef
+    TAO_Value_Out_T<
+        ObjectReferenceTemplate
+      >
+    ObjectReferenceTemplate_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_ch.cpp:56
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
+  
+  class TAO_PortableServer_Export ObjectReferenceTemplate
+    : public virtual PortableInterceptor::ObjectReferenceTemplate
+  {
+  public:
+    typedef ObjectReferenceTemplate_var _var_type;
+    
+    static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
+    
+    // (TAO extensions or internals)
+    static CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ObjectReferenceTemplate *&
+      );
+    
+    virtual const char* _tao_obv_repository_id (void) const;
+    
+    static const char* _tao_obv_static_repository_id (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/valuetype_ch.cpp:250
+  
+  protected:
+    ObjectReferenceTemplate (void);
+    
+    virtual ~ObjectReferenceTemplate (void);
+    
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+    
+  private:
+    ObjectReferenceTemplate (const ObjectReferenceTemplate &);
+    void operator= (const ObjectReferenceTemplate &);
+    
+  protected:
+    virtual CORBA::Boolean
+    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
+    
+    virtual CORBA::Boolean
+    _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module TAO_Default_ORT
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/obv_module.cpp:55
+
+namespace OBV_TAO_Default_ORT
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
+  
+  // OBV_ class
+  class TAO_PortableServer_Export ObjectReferenceTemplate
+    : public virtual TAO_Default_ORT::ObjectReferenceTemplate
+  {
+  public:
+    
+  protected:
+    ObjectReferenceTemplate (void);
+    virtual ~ObjectReferenceTemplate (void);
+    
+  protected:
+    virtual CORBA::Boolean
+    _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
+    
+    virtual CORBA::Boolean
+    _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
+    
+    CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
+    CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
+  
+  private:
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
+  {
+    static void tao_add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void tao_remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+    static void tao_release (TAO_Default_ORT::ObjectReferenceTemplate *);
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_ch.cpp:54
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:434
+
+namespace CORBA
+{
+  TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+  TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:978
+
+#if defined (__ACE_INLINE__)
+#include "Default_ORTC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i
new file mode 100644
index 00000000000..dcda17bcba3
--- /dev/null
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -0,0 +1,45 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
+
+ACE_INLINE
+TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
+{}
+
+ACE_INLINE
+TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
+ACE_INLINE const char* 
+TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
+{
+  return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
+}
+
diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp
new file mode 100644
index 00000000000..df689cc906b
--- /dev/null
+++ b/TAO/tao/PortableServer/IORInfo.cpp
@@ -0,0 +1,210 @@
+#include "tao/PortableServer/IORInfo.h"
+#include "tao/PortableServer/POA.h"
+
+#include "tao/PolicyC.h"
+#include "tao/IOPC.h"
+#include "tao/ORB_Constants.h"
+
+
+ACE_RCSID (PortableServer,
+           IORInfo,
+           "$Id$")
+
+
+#if !defined (__ACE_INLINE__)
+# include "IORInfo.inl"
+#endif /* __ACE_INLINE__ */
+
+
+TAO_IORInfo::TAO_IORInfo (TAO_POA *poa)
+  : poa_ (poa),
+    components_established_ (0)
+{
+}
+
+TAO_IORInfo::~TAO_IORInfo (void)
+{
+}
+
+CORBA::Policy_ptr
+TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
+                                   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  TAO_POA_Policy_Set &policies =
+    this->poa_->policies ();
+
+  // @@ This brain damaged implementation exists due to the fact
+  //    neither TAO_POA nor TAO_POA_Policy_Set exposes any methods
+  //    useful for retrieving a given Policy in the POA's PolicyList.
+  //    So, I use the lame interfaces for now.
+  //          -Ossama
+  const CORBA::ULong num_policies = policies.num_policies ();
+  for (CORBA::ULong i = 0; i < num_policies; ++i)
+    {
+      // @@ This incurs at least two locks per loop iteration due
+      //    to the reference counting found within the policy
+      //    object reference!!!
+      CORBA::Policy_var policy = policies.get_policy_by_index (i);
+
+      CORBA::PolicyType ptype =
+        policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      if (ptype == type)
+        return policy._retn ();
+    }
+
+  // TODO: Now check the global ORB policies.
+  // ........
+
+  // No policy matching the given PolicyType was found.
+  ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
+                                       CORBA::COMPLETED_NO),
+                    CORBA::Policy::_nil ());
+}
+
+void
+TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
+                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (this->components_established_)
+    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                     CORBA::COMPLETED_NO));
+
+  // Add the given tagged component to all profiles.
+  this->poa_->save_ior_component (component
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_IORInfo::add_ior_component_to_profile (
+    const IOP::TaggedComponent &component,
+    IOP::ProfileId profile_id
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (this->components_established_)
+    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                     CORBA::COMPLETED_NO));
+
+  this->poa_->save_ior_component_and_profile_id (component,
+                                                 profile_id
+                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+PortableInterceptor::AdapterManagerId
+TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+PortableInterceptor::AdapterState
+TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT);
+
+  return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+PortableInterceptor::ObjectReferenceTemplate *
+TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Return the Object Reference Template whenever an IOR Interceptor
+  // is invoked.  Its value is the template created for the adapter
+  // policies and the IOR Interceptor calls to add_ior_component and
+  // add_ior_component_to_profile.  It's a const value and its value
+  // never changes.
+  PortableInterceptor::ObjectReferenceTemplate *adapter_template =
+    this->poa_->get_adapter_template ();
+
+  if (adapter_template == 0)
+    {
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                              CORBA::COMPLETED_NO),
+                        0);
+    }
+
+  CORBA::add_ref (adapter_template);
+
+  return adapter_template;
+}
+
+PortableInterceptor::ObjectReferenceFactory *
+TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Return the current_factory that is used to create the object
+  // references by the adapter.  Though initially, its value is the
+  // same as the adapter_template, unlike adapter_template, its value
+  // can be changed.  The value of the current_factory can be changed
+  // only during the call to components_established method.
+  PortableInterceptor::ObjectReferenceFactory *adapter_factory =
+    this->poa_->get_obj_ref_factory ();
+
+  if (adapter_factory == 0)
+    {
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+                                              CORBA::COMPLETED_NO),
+                        0);
+    }
+
+  CORBA::add_ref (adapter_factory);
+
+  return adapter_factory;
+}
+
+void
+TAO_IORInfo::current_factory (
+    PortableInterceptor::ObjectReferenceFactory * current_factory
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->poa_->set_obj_ref_factory (current_factory
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (this->poa_ == 0)
+    {
+      // Although not defined by the spec, duplicate the behavior used
+      // by the ORBInitInfo object once CORBA::ORB_init() has been
+      // called.  Specifically, the IORInfo object is no longer valid
+      // once the POA has invoked all IORInterceptor interception
+      // points.  This also prevents memory access violations from
+      // occuring if the POA is destroyed before this IORInfo object.
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
+                                          CORBA::COMPLETED_NO));
+    }
+}
diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h
new file mode 100644
index 00000000000..5b168a59fe4
--- /dev/null
+++ b/TAO/tao/PortableServer/IORInfo.h
@@ -0,0 +1,173 @@
+// -*- C++ -*-
+
+// ===================================================================
+/**
+ *  @file   IORInfo.h
+ *
+ *  $Id$
+ *
+ *  @author Ossama Othman <ossama@uci.edu>
+ */
+// ===================================================================
+
+#ifndef TAO_IOR_INFO_H
+#define TAO_IOR_INFO_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IORInterceptor/IORInterceptorC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+
+/// Forward declarations.
+class TAO_POA;
+
+
+/**
+ * @class TAO_IORInfo
+ *
+ * @brief This class exposes an interface that allows IORInterceptors add
+ * tagged components to IORs.
+ */
+class TAO_IORInfo
+  : public virtual PortableInterceptor::IORInfo,
+    public virtual TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor.
+  TAO_IORInfo (TAO_POA *poa);
+
+  /**
+   * @name PortableInterceptor::IORInfo Methods
+   *
+   * Methods exposed by the PortableInterceptor::IORInfo interface.
+   */
+  //@{
+
+  /// Return the policy matching the given policy type that is in
+  /// effect for the object whose IOR is being created.
+  virtual CORBA::Policy_ptr get_effective_policy (
+      CORBA::PolicyType type
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// Add the given tagged component to all profiles.
+  virtual void add_ior_component (
+      const IOP::TaggedComponent & component
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  /// Add the given tagged component to all profiles matching the given
+  /// ProfileId.
+  virtual void add_ior_component_to_profile (
+      const IOP::TaggedComponent & component,
+      IOP::ProfileId profile_id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::AdapterManagerId manager_id (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::AdapterState state (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::ObjectReferenceFactory * current_factory (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void current_factory (
+      PortableInterceptor::ObjectReferenceFactory * current_factory
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+  //@}
+
+  /// Invalidate this IORInfo instance.
+  /**
+   * Once the IOR interception points have been invoked, this IORInfo
+   * instance is no longer valid.
+   */
+  void invalidate (void);
+
+  /// Inform the this IORInfo object that the
+  /// IORInterceptor::components_established() interception point has
+  /// been called.
+  /**
+   * This method is used so to inform the IORInfo when the
+   * add_ior_component() and add_ior_component_to_profile() methods
+   * are invalid.  They are only valid in the
+   * IORInterceptor::establish_components() interception point.
+   */
+  void components_established (void);
+
+protected:
+
+  /// Protected destructor to enforce proper memory managment through
+  /// the reference counting mechanism.
+  ~TAO_IORInfo (void);
+
+  /// Check if this IORInfo instance is valid.
+  /**
+   * Once all IORInterceptor interception points have been called,
+   * this IORInfo object is no longer valid.  Throw an exception in
+   * that case.
+   */
+  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+
+private:
+
+  /// Prevent copying through the copy constructor and the assignment
+  /// operator.
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_IORInfo (const TAO_IORInfo &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &))
+
+private:
+
+  /// Pointer to POA
+  TAO_POA *poa_;
+
+  /// True if the IORInterceptor::components_established()
+  /// interception point was called.  False otherwise.
+  /**
+   * This flag is used to prevent the add_ior_component() and
+   * add_ior_component_to_profile() methods from being incorrectly
+   * called after the IORInterceptor::establish_components()
+   * interception point has been called.
+   */
+  CORBA::Boolean components_established_;
+
+};
+
+#if defined (__ACE_INLINE__)
+# include "IORInfo.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_IOR_INFO_H */
diff --git a/TAO/tao/PortableServer/IORInfo.inl b/TAO/tao/PortableServer/IORInfo.inl
new file mode 100644
index 00000000000..3a94b482656
--- /dev/null
+++ b/TAO/tao/PortableServer/IORInfo.inl
@@ -0,0 +1,15 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE void
+TAO_IORInfo::invalidate (void)
+{
+  this->poa_ = 0;
+}
+
+ACE_INLINE void
+TAO_IORInfo::components_established (void)
+{
+  this->components_established_ = 1;
+}
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index 69eb28988f7..d41ca21cfa3 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp
@@ -48,7 +48,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImR_LocatorC.inl"
+#include "ImR_LocatorC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -60,7 +60,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -74,13 +74,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -93,13 +93,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -112,13 +112,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -134,7 +134,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -151,7 +151,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Administration>
     : public
@@ -165,13 +165,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Locator::ServerNameList>
     : public
@@ -194,7 +194,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Locator_ptr
-TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_duplicate (
     ImplementationRepository::Locator_ptr p
   )
 {
@@ -203,7 +203,7 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::Locator>::release (
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_release (
     ImplementationRepository::Locator_ptr p
   )
 {
@@ -212,14 +212,14 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Locator_ptr
-TAO::Objref_Traits<ImplementationRepository::Locator>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_nil (void)
 {
   return ImplementationRepository::Locator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::Locator>::marshal (
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_marshal (
     ImplementationRepository::Locator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -228,12 +228,12 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CS_)
@@ -287,29 +287,29 @@ static const CORBA::Long _oc_ImplementationRepository_Locator_ServerNameList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4c6f63),
-  ACE_NTOHL (0x61746f72),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x7665724e),
-  ACE_NTOHL (0x616d654c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4c6f63), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x7665724e), 
+  ACE_NTOHL (0x616d654c), 
+  ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Locator/ServerNameList:1.0
     15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724e61),
-  ACE_NTOHL (0x6d654c69),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724e61), 
+  ACE_NTOHL (0x6d654c69), 
   ACE_NTOHL (0x73740000),  // name = ServerNameList
     CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     0U,
 
@@ -344,39 +344,39 @@ void ImplementationRepository::Locator::activate_server_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       },
-
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -385,7 +385,7 @@ void ImplementationRepository::Locator::activate_server_in_activator (
       28,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_activate_server_in_activator_exceptiondata,
       2
@@ -411,25 +411,25 @@ void ImplementationRepository::Locator::remove_server_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -437,7 +437,7 @@ void ImplementationRepository::Locator::remove_server_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -446,7 +446,7 @@ void ImplementationRepository::Locator::remove_server_in_activator (
       26,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_remove_server_in_activator_exceptiondata,
       1
@@ -472,25 +472,25 @@ void ImplementationRepository::Locator::shutdown_server_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -498,7 +498,7 @@ void ImplementationRepository::Locator::shutdown_server_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -507,7 +507,7 @@ void ImplementationRepository::Locator::shutdown_server_in_activator (
       28,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_shutdown_server_in_activator_exceptiondata,
       1
@@ -533,25 +533,25 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_activator
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -559,7 +559,7 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -568,7 +568,7 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_activator (
       36,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_server_is_shutting_down_in_activator_exceptiondata,
       1
@@ -594,17 +594,17 @@ CORBA::Long ImplementationRepository::Locator::register_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< CORBA::Long>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< ::ImplementationRepository::Administration>::in_arg_val _tao_admin (admin);
   TAO::Arg_Traits< ::ImplementationRepository::Locator::ServerNameList>::in_arg_val _tao_servers (servers);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -612,7 +612,7 @@ CORBA::Long ImplementationRepository::Locator::register_activator (
       &_tao_admin,
       &_tao_servers
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -621,10 +621,10 @@ CORBA::Long ImplementationRepository::Locator::register_activator (
       18,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -644,23 +644,23 @@ void ImplementationRepository::Locator::unregister_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_token (token);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_activator,
       &_tao_token
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -669,7 +669,7 @@ void ImplementationRepository::Locator::unregister_activator (
       20,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -693,18 +693,18 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -713,9 +713,9 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
       &_tao_addr,
       &_tao_server_object
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -723,7 +723,7 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -732,7 +732,7 @@ void ImplementationRepository::Locator::server_is_running_in_activator (
       30,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_server_is_running_in_activator_exceptiondata,
       1
@@ -759,17 +759,17 @@ void ImplementationRepository::Locator::find_in_activator (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Locator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_activator (activator);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -777,9 +777,9 @@ void ImplementationRepository::Locator::find_in_activator (
       &_tao_activator,
       &_tao_info
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata [] =
+  _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -787,7 +787,7 @@ void ImplementationRepository::Locator::find_in_activator (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -796,7 +796,7 @@ void ImplementationRepository::Locator::find_in_activator (
       17,
       this->the_TAO_Locator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Locator_find_in_activator_exceptiondata,
       1
@@ -819,14 +819,14 @@ ImplementationRepository::Locator::ImplementationRepository_Locator_setup_colloc
       this->the_TAO_Locator_Proxy_Broker_ =
         ::ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer (this);
     }
-
+  
   this->ImplementationRepository_Administration_setup_collocation ();
 }
 
 ImplementationRepository::Locator::~Locator (void)
 {}
 
-void
+void 
 ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer)
 {
   Locator *_tao_tmp_pointer =
@@ -871,7 +871,7 @@ ImplementationRepository::Locator::_duplicate (Locator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -925,19 +925,19 @@ static const CORBA::Long _oc_ImplementationRepository_Locator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4c6f63),
-  ACE_NTOHL (0x61746f72),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4c6f63), 
+  ACE_NTOHL (0x61746f72), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Locator:1.0
     8,
-  ACE_NTOHL (0x4c6f6361),
+  ACE_NTOHL (0x4c6f6361), 
   ACE_NTOHL (0x746f7200),  // name = Locator
   };
 
@@ -1010,7 +1010,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1080,20 +1080,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i].in ());
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -1103,7 +1103,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1113,27 +1113,27 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-
+        
       }
-
+    
     return _tao_marshal_flag;
-
+  
   }
 
 return 0;
@@ -1159,21 +1159,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::Locator RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -1346,7 +1346,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::Locator
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::Locator
@@ -1528,7 +1528,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::Locator
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::Locator
@@ -1544,4 +1544,5 @@ CORBA::Boolean operator>> (
         ImplementationRepository::Locator \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index 04204a62336..4ef0decde0c 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.h
@@ -74,13 +74,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,22 +90,22 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Locator
       >
     Locator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Locator
@@ -113,13 +113,13 @@ namespace ImplementationRepository
     Locator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual ::ImplementationRepository::Administration
   {
@@ -127,42 +127,42 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<Locator>;
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
-
+    
     // The static operations.
     static Locator_ptr _duplicate (Locator_ptr obj);
-
+    
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Locator_ptr _nil (void)
     {
       return (Locator_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST_CH_
-
+    
     class ServerNameList;
-
+    
     typedef
       TAO_MngSeq_Var_T<
           ServerNameList,
           TAO_SeqElem_String_Manager
         >
       ServerNameList_var;
-
+    
     typedef
       TAO_MngSeq_Out_T<
           ServerNameList,
@@ -170,7 +170,7 @@ namespace ImplementationRepository
           TAO_SeqElem_String_Manager
         >
       ServerNameList_out;
-
+    
     class TAO_PortableServer_Export ServerNameList
       : public
           TAO_Unbounded_String_Sequence
@@ -181,27 +181,27 @@ namespace ImplementationRepository
       ServerNameList (
           CORBA::ULong max,
           CORBA::ULong length,
-          char ** buffer,
+          char ** buffer, 
           CORBA::Boolean release = 0
         );
       ServerNameList (const ServerNameList &);
       ~ServerNameList (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef ServerNameList_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ServerNameList;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_server_in_activator (
         const char * server,
         const char * activator
@@ -212,10 +212,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void remove_server_in_activator (
         const char * server,
         const char * activator
@@ -225,10 +225,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown_server_in_activator (
         const char * server,
         const char * activator
@@ -238,10 +238,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_shutting_down_in_activator (
         const char * server,
         const char * activator
@@ -251,10 +251,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Long register_activator (
         const char * activator,
         ::ImplementationRepository::Administration_ptr admin,
@@ -264,10 +264,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void unregister_activator (
         const char * activator,
         ::CORBA::Long token
@@ -276,10 +276,10 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_running_in_activator (
         const char * server,
         const char * activator,
@@ -291,10 +291,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void find_in_activator (
         const char * server,
         const char * activator,
@@ -305,34 +305,34 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Locator (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Locator_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Locator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Locator (
         TAO_Stub *objref,
@@ -340,21 +340,21 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Locator (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Locator (const Locator &);
-
+    
     void operator= (const Locator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
 
 // TAO_IDL - Generated from
@@ -382,18 +382,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Locator>
   {
-    static ImplementationRepository::Locator_ptr duplicate (
+    static ImplementationRepository::Locator_ptr tao_duplicate (
         ImplementationRepository::Locator_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::Locator_ptr
       );
-    static ImplementationRepository::Locator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::Locator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::Locator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -444,7 +444,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:976
 
 #if defined (__ACE_INLINE__)
-#include "ImR_LocatorC.inl"
+#include "ImR_LocatorC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -458,3 +458,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i
new file mode 100644
index 00000000000..4908d458454
--- /dev/null
+++ b/TAO/tao/PortableServer/ImR_LocatorC.i
@@ -0,0 +1,64 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___CI_)
+#define _IMPLEMENTATIONREPOSITORY_LOCATOR___CI_
+
+ACE_INLINE
+ImplementationRepository::Locator::Locator (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_Locator_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_Locator_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::Locator::Locator (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_Locator_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index fed027a95c4..9dc87f23eac 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:629
 
 #ifndef _TAO_IDL_IMR_LOCATORS_CPP_
@@ -66,7 +66,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImR_LocatorS.inl"
+#include "ImR_LocatorS.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -78,7 +78,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -92,13 +92,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -111,13 +111,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -130,13 +130,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -152,7 +152,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -169,7 +169,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Administration>
     : public
@@ -183,13 +183,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_SERVERNAMELIST__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::Locator::ServerNameList>
     : public
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h
index 95551511324..47a4e377bfc 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS.h
@@ -60,85 +60,85 @@
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class Locator;
   typedef Locator *Locator_ptr;
-
+  
   class _TAO_Locator_ThruPOA_Proxy_Impl;
   class _TAO_Locator_Direct_Proxy_Impl;
   class _TAO_Locator_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual POA_ImplementationRepository::Administration
   {
   protected:
     Locator (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::Locator _stub_type;
     typedef ::ImplementationRepository::Locator_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::Locator_var _stub_var_type;
-
+    
     Locator (const Locator& rhs);
     virtual ~Locator (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::Locator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void activate_server_in_activator (
         const char * server,
         const char * activator
@@ -149,17 +149,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     static void activate_server_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void remove_server_in_activator (
         const char * server,
         const char * activator
@@ -169,17 +169,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void remove_server_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown_server_in_activator (
         const char * server,
         const char * activator
@@ -189,17 +189,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void shutdown_server_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_shutting_down_in_activator (
         const char * server,
         const char * activator
@@ -209,17 +209,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_shutting_down_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual CORBA::Long register_activator (
         const char * activator,
         ::ImplementationRepository::Administration_ptr admin,
@@ -229,17 +229,17 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void register_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void unregister_activator (
         const char * activator,
         ::CORBA::Long token
@@ -248,17 +248,17 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void unregister_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_running_in_activator (
         const char * server,
         const char * activator,
@@ -270,17 +270,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_running_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void find_in_activator (
         const char * server,
         const char * activator,
@@ -291,169 +291,169 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void find_in_activator_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     activate_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     activate_server_with_startup_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     register_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     reregister_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     remove_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     shutdown_server_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     server_is_running_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     server_is_shutting_down_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     find_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     list_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     shutdown_repo_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
-
+    
     static void
     find_ior_skel (
-        TAO_ServerRequest &req,
+        TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Locator_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Locator_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -466,34 +466,34 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_Locator_Strategized_Proxy_Broker *
     the_TAO_Locator_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl
     : public virtual ::POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Locator_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -506,10 +506,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -521,10 +521,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -536,10 +536,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -551,10 +551,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_activator (
         TAO_Abstract_ServantBase *servant,
@@ -565,10 +565,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     unregister_activator (
         TAO_Abstract_ServantBase *servant,
@@ -579,10 +579,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -594,10 +594,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -609,13 +609,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -625,13 +625,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server_with_startup (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -641,13 +641,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     register_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -657,13 +657,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     reregister_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -673,13 +673,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     remove_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -688,13 +688,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -703,13 +703,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_running (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -718,13 +718,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_shutting_down (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -733,13 +733,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -748,13 +748,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     list (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -762,13 +762,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_repo (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -776,13 +776,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find_ior (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -792,29 +792,29 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl
     : public virtual ::POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl
   {
   public:
     _TAO_Locator_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Locator_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -827,10 +827,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -842,10 +842,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -857,10 +857,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -872,10 +872,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_activator (
         TAO_Abstract_ServantBase *servant,
@@ -886,10 +886,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     unregister_activator (
         TAO_Abstract_ServantBase *servant,
@@ -900,10 +900,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -915,10 +915,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_in_activator (
         TAO_Abstract_ServantBase *servant,
@@ -930,13 +930,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -946,13 +946,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     activate_server_with_startup (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -962,13 +962,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     register_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -978,13 +978,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     reregister_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -994,13 +994,13 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     remove_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1009,13 +1009,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_server (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1024,13 +1024,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_running (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1039,13 +1039,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     server_is_shutting_down (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1054,13 +1054,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1069,13 +1069,13 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     list (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1083,13 +1083,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     shutdown_repo (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1097,13 +1097,13 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2214
-
+    
     static void
     find_ior (
-        TAO_Abstract_ServantBase *servant,
+        TAO_Abstract_ServantBase *servant, 
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1113,24 +1113,24 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 
 // TAO_IDL - Generated from
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1012
 
 
 #if defined (__ACE_INLINE__)
-#include "ImR_LocatorS.inl"
+#include "ImR_LocatorS.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.i b/TAO/tao/PortableServer/ImR_LocatorS.i
new file mode 100644
index 00000000000..3c6b37372ed
--- /dev/null
+++ b/TAO/tao/PortableServer/ImR_LocatorS.i
@@ -0,0 +1,858 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::activate_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::activate_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::activate_server_with_startup_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::register_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::register_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::reregister_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::reregister_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::remove_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::remove_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::shutdown_server_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::shutdown_server_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::server_is_running_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::server_is_running_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::server_is_shutting_down_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::find_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::find_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::list_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::list_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::shutdown_repo_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::shutdown_repo_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2026
+
+ACE_INLINE
+void
+POA_ImplementationRepository::Locator::find_ior_skel (
+    TAO_ServerRequest &req,
+    void *obj,
+    void *context
+    ACE_ENV_ARG_DECL
+  )
+{
+  POA_ImplementationRepository::Administration_ptr impl = (POA_ImplementationRepository::Locator_ptr) obj;
+  POA_ImplementationRepository::Administration::find_ior_skel (
+      req,
+      (POA_ImplementationRepository::Administration_ptr) impl,
+      context
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_with_startup (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_with_startup (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound,
+    ::ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::reregister_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::reregister_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::AlreadyRegistered,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::list (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::list (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_repo (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_repo (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_repo (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_repo (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find_ior (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1334
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find_ior (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ::ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior (
+      servant,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl
index cbeb5fc3708..2cc3e94bfe9 100644
--- a/TAO/tao/PortableServer/ImplRepo.pidl
+++ b/TAO/tao/PortableServer/ImplRepo.pidl
@@ -17,52 +17,52 @@
 
 module ImplementationRepository
 {
-  /**
-   * @brief Server Side IR Object
-   *
-   * This object, which exists on the servers that use the
-   * Implementation Repository (IR), is used to control or check the
-   * status of the server by the IR.
-   */
   interface ServerObject
+    // = TITLE
+    //    Server Side IR Object
+    //
+    // = DESCRIPTION
+    //    This object, which exists on the servers that use the
+    //    Implementation Repository (IR), is used to control or check the
+    //    status of the server by the IR.
   {
-    /// Check the liveness of a server.
     void ping ();
+    // Check the liveness of a server.
 
-    /// Try to shutdown the server gracefully.
     void shutdown ();
+    // Try to shutdown the server gracefully.
   };
 
   // = Exceptions
 
-  /// Object already bound in the Implementation Repository
   exception AlreadyRegistered {};
+  // Object already bound in the Implementation Repository
 
-  /// The server could not be restarted.
   exception CannotActivate
   {
     string reason;
   };
+  // The server could not be restarted.
 
-  /// Object not found in the Implementation Repository
   exception NotFound {};
+  // Object not found in the Implementation Repository
 
-  /// One environment variable/value pair.
   struct EnvironmentVariable
+  // One environment variable/value pair.
   {
     string name;
     string value;
   };
 
-  /// This is used in places that require a partial IOR with
-  /// just the ObjectKey missing.
   typedef string Address;
+  // This is used in places that require a partial IOR with
+  // just the ObjectKey missing.
 
-  /// Complete Environment.
   typedef sequence<EnvironmentVariable> EnvironmentList;
+  // Complete Environment.
 
-  /// The type of Activation
   enum ActivationMode {NORMAL, MANUAL, PER_CLIENT, AUTO_START};
+  // The type of Activation
 
   /// Options used to start up the server.
   struct StartupOptions
@@ -83,8 +83,8 @@ module ImplementationRepository
     string activator;
   };
 
-  /// All the information about one server.
   struct ServerInformation
+  // All the information about one server.
   {
     /// The logical server this server is part of.
     string logical_server;
@@ -104,115 +104,118 @@ module ImplementationRepository
   /// Forward declaration.
   interface ServerInformationIterator;
 
-  /**
-    * @brief The Implementation Repository Administration Interface
-    *
-    * This interface exports all the administration functionality of
-    * the Implementation Repository.
-    */
+
   interface Administration
+    // = TITLE
+    //    The Implementation Repository Administration Interface
+    //
+    // = DESCRIPTION
+    //    This interface exports all the administration functionality of
+    //    the Implementation Repository.
   {
-    /// Activate server that is named @a server.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.  The <CannotActivate> exception
-    /// is raised when <server> is found in the Repository but could not be
-    /// activated.
     void activate_server (in string server)
       raises (NotFound, CannotActivate);
+    // Activate server that is named <server>.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.  The <CannotActivate> exception
+    // is raised when <server> is found in the Repository but could not be
+    // activated.
 
     string activate_server_with_startup (in string server,
                                          in long check_startup)
       raises (NotFound, CannotActivate);
 
-    /// Register the <options> to specify how the <server> should be
-    /// restarted when a client asks for it.
-    ///
-    /// The <AlreadyRegistered> exception is raised when <server> has
-    /// already been registered with the Implementation Repository.
-    /// The <NotFound> exception is raised when the activator specified
-    /// in the options is not registered.
     void register_server (in string server,
                           in StartupOptions options)
       raises (AlreadyRegistered, NotFound);
+    // Register the <options> to specify how the <server> should be
+    // restarted when a client asks for it.
+    //
+    // The <AlreadyRegistered> exception is raised when <server> has
+    // already been registered with the Implementation Repository.
+    // The <NotFound> exception is raised when the activator specified
+    // in the options is not registered.
 
-    /// Update the <options> to specify how the <server> should be
-    /// restarted when a client asks for it.  Will register the server
-    /// if not already registered.
-    /// The <AlreadyRegistered> exception is raised when <server> has
-    /// already been registered with a different activator.
-    /// The <NotFound> exception is raised when the activator specified
-    /// in the options is not registered.
     void reregister_server (in string server,
                             in StartupOptions options)
                             raises(AlreadyRegistered, NotFound);
+    // Update the <options> to specify how the <server> should be
+    // restarted when a client asks for it.  Will register the server
+    // if not already registered.
+    // The <AlreadyRegistered> exception is raised when <server> has
+    // already been registered with a different activator.
+    // The <NotFound> exception is raised when the activator specified
+    // in the options is not registered.
 
-    /// Remove <server> from the Implementation Repository.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void remove_server (in string server)
       raises (NotFound);
+    // Remove <server> from the Implementation Repository.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Tries to shutdown the server, first gracefully, then ungracefully.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void shutdown_server (in string server)
       raises (NotFound);
+    // Tries to shutdown the server, first gracefully, then ungracefully.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Used to notify the Implementation Repository that <server> is alive
-    /// and well at <addr>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void server_is_running (in string server,
                                in Address addr,
                                in ServerObject server_object)
       raises (NotFound);
+    // Used to notify the Implementation Repository that <server> is alive
+    // and well at <addr>.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Used to tell the Implementation Repository that <server> is shutting
-    /// down.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void server_is_shutting_down (in string server)
       raises (NotFound);
+    // Used to tell the Implementation Repository that <server> is shutting
+    // down.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Returns the startup information for a given <server>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
     void find (in string server,
                out ServerInformation info)
       raises (NotFound);
+    // Returns the startup information for a given <server>.
+    //
+    // The <NotFound> exception is raised when <server> is not found
+    // in the Implementation Repository.
 
-    /// Returns at most <how_many> servers in <server_list>.  If there
-    /// are additional servers, they can be received through the
-    /// <server_iterator>.  If there are no more servers, then
-    /// <server_iterator> is null.
     void list (in unsigned long how_many,
                out ServerInformationList server_list,
                out ServerInformationIterator server_iterator);
+    // Returns at most <how_many> servers in <server_list>.  If there
+    // are additional servers, they can be received through the
+    // <server_iterator>.  If there are no more servers, then
+    // <server_iterator> is null.
 
-    /// Shuts down the repository
     void shutdown_repo() ;
+    // Shuts down the repository
 
     string find_ior (in string object_name)
       raises (NotFound);
 
   };
 
-  /// Interface for iterating over servers returned with
-  /// Administration::list ().
   interface ServerInformationIterator
   {
-    /// This operation returns at most the requested number of
-    /// servers.
+    // = TITLE
+    // Interface for iterating over servers returned with
+    // Administration::list ().
+
     boolean next_n (in unsigned long how_many,
                     out ServerInformationList server_list);
+    // This operation returns at most the requested number of
+    // servers.
 
-    /// This operation destroys the iterator.
     void destroy ();
+    // This operation destroys the iterator.
   };
 };
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 143506a5db1..c524a0b68cf 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -50,7 +50,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
+#include "ImplRepoC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -62,7 +62,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -76,13 +76,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -95,13 +95,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -114,13 +114,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -136,7 +136,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -160,7 +160,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_duplicate (
     ImplementationRepository::ServerObject_ptr p
   )
 {
@@ -169,7 +169,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_release (
     ImplementationRepository::ServerObject_ptr p
   )
 {
@@ -178,14 +178,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_nil (void)
 {
   return ImplementationRepository::ServerObject::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_marshal (
     ImplementationRepository::ServerObject_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -194,7 +194,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -213,19 +213,19 @@ void ImplementationRepository::ServerObject::ping (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -234,7 +234,7 @@ void ImplementationRepository::ServerObject::ping (
       4,
       this->the_TAO_ServerObject_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -253,19 +253,19 @@ void ImplementationRepository::ServerObject::shutdown (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerObject_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -274,7 +274,7 @@ void ImplementationRepository::ServerObject::shutdown (
       8,
       this->the_TAO_ServerObject_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -298,7 +298,7 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se
 ImplementationRepository::ServerObject::~ServerObject (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerObject *_tao_tmp_pointer =
@@ -343,7 +343,7 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -393,22 +393,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x7665724f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x7665724f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
     13,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724f62),
-  ACE_NTOHL (0x6a656374),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = ServerObject
   };
 
@@ -426,7 +426,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_ServerObject;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
@@ -509,7 +509,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -522,7 +522,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -539,24 +539,24 @@ static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416c72),
-  ACE_NTOHL (0x65616479),
-  ACE_NTOHL (0x52656769),
-  ACE_NTOHL (0x73746572),
-  ACE_NTOHL (0x65643a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416c72), 
+  ACE_NTOHL (0x65616479), 
+  ACE_NTOHL (0x52656769), 
+  ACE_NTOHL (0x73746572), 
+  ACE_NTOHL (0x65643a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/AlreadyRegistered:1.0
     18,
-  ACE_NTOHL (0x416c7265),
-  ACE_NTOHL (0x61647952),
-  ACE_NTOHL (0x65676973),
-  ACE_NTOHL (0x74657265),
+  ACE_NTOHL (0x416c7265), 
+  ACE_NTOHL (0x61647952), 
+  ACE_NTOHL (0x65676973), 
+  ACE_NTOHL (0x74657265), 
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
   };
@@ -575,7 +575,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
@@ -660,7 +660,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -673,7 +673,7 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -706,28 +706,28 @@ static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f43616e),
-  ACE_NTOHL (0x6e6f7441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f43616e), 
+  ACE_NTOHL (0x6e6f7441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/CannotActivate:1.0
     15,
-  ACE_NTOHL (0x43616e6e),
-  ACE_NTOHL (0x6f744163),
-  ACE_NTOHL (0x74697661),
+  ACE_NTOHL (0x43616e6e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697661), 
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
     7,
-  ACE_NTOHL (0x72656173),
+  ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -745,7 +745,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_CannotActivate;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
@@ -828,7 +828,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -841,7 +841,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -858,20 +858,20 @@ static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f4e6f74),
-  ACE_NTOHL (0x466f756e),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f4e6f74), 
+  ACE_NTOHL (0x466f756e), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/NotFound:1.0
     9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
   };
@@ -897,36 +897,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x56617269),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x56617269), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
     20,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e7456),
-  ACE_NTOHL (0x61726961),
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7456), 
+  ACE_NTOHL (0x61726961), 
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -944,10 +944,10 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -964,21 +964,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416464),
-  ACE_NTOHL (0x72657373),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
     8,
-  ACE_NTOHL (0x41646472),
+  ACE_NTOHL (0x41646472), 
   ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -996,7 +996,7 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_Address;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
@@ -1056,23 +1056,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
     16,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e744c),
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
     CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
@@ -1081,36 +1081,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
     132, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       53,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x56617269),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x56617269), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
             20,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e7456),
-      ACE_NTOHL (0x61726961),
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e7456), 
+      ACE_NTOHL (0x61726961), 
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
             5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       6,
-      ACE_NTOHL (0x76616c75),
+      ACE_NTOHL (0x76616c75), 
       ACE_NTOHL (0x65000000),  // name = value
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -1138,37 +1138,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416374),
-  ACE_NTOHL (0x69766174),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416374), 
+  ACE_NTOHL (0x69766174), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
   15,
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e4d6f),
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e4d6f), 
   ACE_NTOHL (0x64650000),  // name = ActivationMode
   4, // member count
   7,
-  ACE_NTOHL (0x4e4f524d),
+  ACE_NTOHL (0x4e4f524d), 
   ACE_NTOHL (0x414c0000),  // name = NORMAL
   7,
-  ACE_NTOHL (0x4d414e55),
+  ACE_NTOHL (0x4d414e55), 
   ACE_NTOHL (0x414c0000),  // name = MANUAL
   11,
-  ACE_NTOHL (0x5045525f),
-  ACE_NTOHL (0x434c4945),
+  ACE_NTOHL (0x5045525f), 
+  ACE_NTOHL (0x434c4945), 
   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
   11,
-  ACE_NTOHL (0x4155544f),
-  ACE_NTOHL (0x5f535441),
+  ACE_NTOHL (0x4155544f), 
+  ACE_NTOHL (0x5f535441), 
   ACE_NTOHL (0x52540000),  // name = AUTO_START
   };
 
@@ -1193,56 +1193,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f537461),
-  ACE_NTOHL (0x72747570),
-  ACE_NTOHL (0x4f707469),
-  ACE_NTOHL (0x6f6e733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f537461), 
+  ACE_NTOHL (0x72747570), 
+  ACE_NTOHL (0x4f707469), 
+  ACE_NTOHL (0x6f6e733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
     15,
-  ACE_NTOHL (0x53746172),
-  ACE_NTOHL (0x7475704f),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x53746172), 
+  ACE_NTOHL (0x7475704f), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = StartupOptions
   5, // member count
     13,
-  ACE_NTOHL (0x636f6d6d),
-  ACE_NTOHL (0x616e645f),
-  ACE_NTOHL (0x6c696e65),
+  ACE_NTOHL (0x636f6d6d), 
+  ACE_NTOHL (0x616e645f), 
+  ACE_NTOHL (0x6c696e65), 
   ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   12,
-  ACE_NTOHL (0x656e7669),
-  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e7669), 
+  ACE_NTOHL (0x726f6e6d), 
   ACE_NTOHL (0x656e7400),  // name = environment
     CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     49,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f456e76),
-    ACE_NTOHL (0x69726f6e),
-    ACE_NTOHL (0x6d656e74),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f456e76), 
+    ACE_NTOHL (0x69726f6e), 
+    ACE_NTOHL (0x6d656e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
         16,
-    ACE_NTOHL (0x456e7669),
-    ACE_NTOHL (0x726f6e6d),
-    ACE_NTOHL (0x656e744c),
+    ACE_NTOHL (0x456e7669), 
+    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e744c), 
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
         CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
@@ -1251,95 +1251,95 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
       132, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         53,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f456e76),
-        ACE_NTOHL (0x69726f6e),
-        ACE_NTOHL (0x6d656e74),
-        ACE_NTOHL (0x56617269),
-        ACE_NTOHL (0x61626c65),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f456e76), 
+        ACE_NTOHL (0x69726f6e), 
+        ACE_NTOHL (0x6d656e74), 
+        ACE_NTOHL (0x56617269), 
+        ACE_NTOHL (0x61626c65), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                 20,
-        ACE_NTOHL (0x456e7669),
-        ACE_NTOHL (0x726f6e6d),
-        ACE_NTOHL (0x656e7456),
-        ACE_NTOHL (0x61726961),
+        ACE_NTOHL (0x456e7669), 
+        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7456), 
+        ACE_NTOHL (0x61726961), 
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
                 5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         6,
-        ACE_NTOHL (0x76616c75),
+        ACE_NTOHL (0x76616c75), 
         ACE_NTOHL (0x65000000),  // name = value
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   18,
-  ACE_NTOHL (0x776f726b),
-  ACE_NTOHL (0x696e675f),
-  ACE_NTOHL (0x64697265),
-  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x776f726b), 
+  ACE_NTOHL (0x696e675f), 
+  ACE_NTOHL (0x64697265), 
+  ACE_NTOHL (0x63746f72), 
   ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   11,
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x76617469), 
   ACE_NTOHL (0x6f6e0000),  // name = activation
     CORBA::tk_enum, // typecode kind
   136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416374),
-    ACE_NTOHL (0x69766174),
-    ACE_NTOHL (0x696f6e4d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416374), 
+    ACE_NTOHL (0x69766174), 
+    ACE_NTOHL (0x696f6e4d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
     15,
-    ACE_NTOHL (0x41637469),
-    ACE_NTOHL (0x76617469),
-    ACE_NTOHL (0x6f6e4d6f),
+    ACE_NTOHL (0x41637469), 
+    ACE_NTOHL (0x76617469), 
+    ACE_NTOHL (0x6f6e4d6f), 
     ACE_NTOHL (0x64650000),  // name = ActivationMode
     4, // member count
     7,
-    ACE_NTOHL (0x4e4f524d),
+    ACE_NTOHL (0x4e4f524d), 
     ACE_NTOHL (0x414c0000),  // name = NORMAL
     7,
-    ACE_NTOHL (0x4d414e55),
+    ACE_NTOHL (0x4d414e55), 
     ACE_NTOHL (0x414c0000),  // name = MANUAL
     11,
-    ACE_NTOHL (0x5045525f),
-    ACE_NTOHL (0x434c4945),
+    ACE_NTOHL (0x5045525f), 
+    ACE_NTOHL (0x434c4945), 
     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
     11,
-    ACE_NTOHL (0x4155544f),
-    ACE_NTOHL (0x5f535441),
+    ACE_NTOHL (0x4155544f), 
+    ACE_NTOHL (0x5f535441), 
     ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+    
   10,
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x7661746f),
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x7661746f), 
   ACE_NTOHL (0x72000000),  // name = activator
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -1357,10 +1357,10 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_StartupOptions;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 ImplementationRepository::StartupOptions::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1377,95 +1377,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
     18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
     15,
-  ACE_NTOHL (0x6c6f6769),
-  ACE_NTOHL (0x63616c5f),
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6c6f6769), 
+  ACE_NTOHL (0x63616c5f), 
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = logical_server
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   7,
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = server
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   8,
-  ACE_NTOHL (0x73746172),
+  ACE_NTOHL (0x73746172), 
   ACE_NTOHL (0x74757000),  // name = startup
     CORBA::tk_struct, // typecode kind
   584, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f537461),
-    ACE_NTOHL (0x72747570),
-    ACE_NTOHL (0x4f707469),
-    ACE_NTOHL (0x6f6e733a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f537461), 
+    ACE_NTOHL (0x72747570), 
+    ACE_NTOHL (0x4f707469), 
+    ACE_NTOHL (0x6f6e733a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
         15,
-    ACE_NTOHL (0x53746172),
-    ACE_NTOHL (0x7475704f),
-    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x53746172), 
+    ACE_NTOHL (0x7475704f), 
+    ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e730000),  // name = StartupOptions
     5, // member count
         13,
-    ACE_NTOHL (0x636f6d6d),
-    ACE_NTOHL (0x616e645f),
-    ACE_NTOHL (0x6c696e65),
+    ACE_NTOHL (0x636f6d6d), 
+    ACE_NTOHL (0x616e645f), 
+    ACE_NTOHL (0x6c696e65), 
     ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     12,
-    ACE_NTOHL (0x656e7669),
-    ACE_NTOHL (0x726f6e6d),
+    ACE_NTOHL (0x656e7669), 
+    ACE_NTOHL (0x726f6e6d), 
     ACE_NTOHL (0x656e7400),  // name = environment
         CORBA::tk_alias, // typecode kind for typedefs
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       49,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x4c697374),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
             16,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e744c),
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e744c), 
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
             CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
@@ -1474,120 +1474,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
         132, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           53,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x56617269),
-          ACE_NTOHL (0x61626c65),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x56617269), 
+          ACE_NTOHL (0x61626c65), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                     20,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e7456),
-          ACE_NTOHL (0x61726961),
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e7456), 
+          ACE_NTOHL (0x61726961), 
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
                     5,
-          ACE_NTOHL (0x6e616d65),
+          ACE_NTOHL (0x6e616d65), 
           ACE_NTOHL (0x0),  // name = name
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
           6,
-          ACE_NTOHL (0x76616c75),
+          ACE_NTOHL (0x76616c75), 
           ACE_NTOHL (0x65000000),  // name = value
-                    CORBA::tk_string,
+                    CORBA::tk_string, 
           0U, // string length
 
         0U,
 
 
     18,
-    ACE_NTOHL (0x776f726b),
-    ACE_NTOHL (0x696e675f),
-    ACE_NTOHL (0x64697265),
-    ACE_NTOHL (0x63746f72),
+    ACE_NTOHL (0x776f726b), 
+    ACE_NTOHL (0x696e675f), 
+    ACE_NTOHL (0x64697265), 
+    ACE_NTOHL (0x63746f72), 
     ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
     11,
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x76617469),
+    ACE_NTOHL (0x61637469), 
+    ACE_NTOHL (0x76617469), 
     ACE_NTOHL (0x6f6e0000),  // name = activation
         CORBA::tk_enum, // typecode kind
     136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
       48,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f416374),
-      ACE_NTOHL (0x69766174),
-      ACE_NTOHL (0x696f6e4d),
-      ACE_NTOHL (0x6f64653a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f416374), 
+      ACE_NTOHL (0x69766174), 
+      ACE_NTOHL (0x696f6e4d), 
+      ACE_NTOHL (0x6f64653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
       15,
-      ACE_NTOHL (0x41637469),
-      ACE_NTOHL (0x76617469),
-      ACE_NTOHL (0x6f6e4d6f),
+      ACE_NTOHL (0x41637469), 
+      ACE_NTOHL (0x76617469), 
+      ACE_NTOHL (0x6f6e4d6f), 
       ACE_NTOHL (0x64650000),  // name = ActivationMode
       4, // member count
       7,
-      ACE_NTOHL (0x4e4f524d),
+      ACE_NTOHL (0x4e4f524d), 
       ACE_NTOHL (0x414c0000),  // name = NORMAL
       7,
-      ACE_NTOHL (0x4d414e55),
+      ACE_NTOHL (0x4d414e55), 
       ACE_NTOHL (0x414c0000),  // name = MANUAL
       11,
-      ACE_NTOHL (0x5045525f),
-      ACE_NTOHL (0x434c4945),
+      ACE_NTOHL (0x5045525f), 
+      ACE_NTOHL (0x434c4945), 
       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
       11,
-      ACE_NTOHL (0x4155544f),
-      ACE_NTOHL (0x5f535441),
+      ACE_NTOHL (0x4155544f), 
+      ACE_NTOHL (0x5f535441), 
       ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+      
     10,
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x7661746f),
+    ACE_NTOHL (0x61637469), 
+    ACE_NTOHL (0x7661746f), 
     ACE_NTOHL (0x72000000),  // name = activator
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
   9,
-  ACE_NTOHL (0x6c6f6361),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x6c6f6361), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = location
     CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416464),
-    ACE_NTOHL (0x72657373),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416464), 
+    ACE_NTOHL (0x72657373), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
         8,
-    ACE_NTOHL (0x41646472),
+    ACE_NTOHL (0x41646472), 
     ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string,
+        CORBA::tk_string, 
     0U, // string length
 
 };
@@ -1606,10 +1606,10 @@ namespace ImplementationRepository
     &_tc_TAO_tc_ImplementationRepository_ServerInformation;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 ImplementationRepository::ServerInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1619,7 +1619,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
@@ -1679,26 +1679,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4c69),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4c69), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
     22,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ServerInformationList
     CORBA::tk_sequence, // typecode kind
   852, // encapsulation length
@@ -1707,95 +1707,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
     836, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       51,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f536572),
-      ACE_NTOHL (0x76657249),
-      ACE_NTOHL (0x6e666f72),
-      ACE_NTOHL (0x6d617469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f536572), 
+      ACE_NTOHL (0x76657249), 
+      ACE_NTOHL (0x6e666f72), 
+      ACE_NTOHL (0x6d617469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
             18,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x6572496e),
-      ACE_NTOHL (0x666f726d),
-      ACE_NTOHL (0x6174696f),
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6572496e), 
+      ACE_NTOHL (0x666f726d), 
+      ACE_NTOHL (0x6174696f), 
       ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
             15,
-      ACE_NTOHL (0x6c6f6769),
-      ACE_NTOHL (0x63616c5f),
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x6c6f6769), 
+      ACE_NTOHL (0x63616c5f), 
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = logical_server
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       7,
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = server
-            CORBA::tk_string,
+            CORBA::tk_string, 
       0U, // string length
       8,
-      ACE_NTOHL (0x73746172),
+      ACE_NTOHL (0x73746172), 
       ACE_NTOHL (0x74757000),  // name = startup
             CORBA::tk_struct, // typecode kind
       584, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         48,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f537461),
-        ACE_NTOHL (0x72747570),
-        ACE_NTOHL (0x4f707469),
-        ACE_NTOHL (0x6f6e733a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f537461), 
+        ACE_NTOHL (0x72747570), 
+        ACE_NTOHL (0x4f707469), 
+        ACE_NTOHL (0x6f6e733a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
                 15,
-        ACE_NTOHL (0x53746172),
-        ACE_NTOHL (0x7475704f),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x53746172), 
+        ACE_NTOHL (0x7475704f), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = StartupOptions
         5, // member count
                 13,
-        ACE_NTOHL (0x636f6d6d),
-        ACE_NTOHL (0x616e645f),
-        ACE_NTOHL (0x6c696e65),
+        ACE_NTOHL (0x636f6d6d), 
+        ACE_NTOHL (0x616e645f), 
+        ACE_NTOHL (0x6c696e65), 
         ACE_NTOHL (0x0),  // name = command_line
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         12,
-        ACE_NTOHL (0x656e7669),
-        ACE_NTOHL (0x726f6e6d),
+        ACE_NTOHL (0x656e7669), 
+        ACE_NTOHL (0x726f6e6d), 
         ACE_NTOHL (0x656e7400),  // name = environment
                 CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           49,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x4c697374),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x4c697374), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
                     16,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e744c),
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e744c), 
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
                     CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
@@ -1804,120 +1804,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
             132, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               53,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x496d706c),
-              ACE_NTOHL (0x656d656e),
-              ACE_NTOHL (0x74617469),
-              ACE_NTOHL (0x6f6e5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x2f456e76),
-              ACE_NTOHL (0x69726f6e),
-              ACE_NTOHL (0x6d656e74),
-              ACE_NTOHL (0x56617269),
-              ACE_NTOHL (0x61626c65),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x496d706c), 
+              ACE_NTOHL (0x656d656e), 
+              ACE_NTOHL (0x74617469), 
+              ACE_NTOHL (0x6f6e5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x2f456e76), 
+              ACE_NTOHL (0x69726f6e), 
+              ACE_NTOHL (0x6d656e74), 
+              ACE_NTOHL (0x56617269), 
+              ACE_NTOHL (0x61626c65), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
                             20,
-              ACE_NTOHL (0x456e7669),
-              ACE_NTOHL (0x726f6e6d),
-              ACE_NTOHL (0x656e7456),
-              ACE_NTOHL (0x61726961),
+              ACE_NTOHL (0x456e7669), 
+              ACE_NTOHL (0x726f6e6d), 
+              ACE_NTOHL (0x656e7456), 
+              ACE_NTOHL (0x61726961), 
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
                             5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
               6,
-              ACE_NTOHL (0x76616c75),
+              ACE_NTOHL (0x76616c75), 
               ACE_NTOHL (0x65000000),  // name = value
-                            CORBA::tk_string,
+                            CORBA::tk_string, 
               0U, // string length
 
             0U,
 
 
         18,
-        ACE_NTOHL (0x776f726b),
-        ACE_NTOHL (0x696e675f),
-        ACE_NTOHL (0x64697265),
-        ACE_NTOHL (0x63746f72),
+        ACE_NTOHL (0x776f726b), 
+        ACE_NTOHL (0x696e675f), 
+        ACE_NTOHL (0x64697265), 
+        ACE_NTOHL (0x63746f72), 
         ACE_NTOHL (0x79000000),  // name = working_directory
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
         11,
-        ACE_NTOHL (0x61637469),
-        ACE_NTOHL (0x76617469),
+        ACE_NTOHL (0x61637469), 
+        ACE_NTOHL (0x76617469), 
         ACE_NTOHL (0x6f6e0000),  // name = activation
                 CORBA::tk_enum, // typecode kind
         136, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
           48,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f416374),
-          ACE_NTOHL (0x69766174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f416374), 
+          ACE_NTOHL (0x69766174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
           15,
-          ACE_NTOHL (0x41637469),
-          ACE_NTOHL (0x76617469),
-          ACE_NTOHL (0x6f6e4d6f),
+          ACE_NTOHL (0x41637469), 
+          ACE_NTOHL (0x76617469), 
+          ACE_NTOHL (0x6f6e4d6f), 
           ACE_NTOHL (0x64650000),  // name = ActivationMode
           4, // member count
           7,
-          ACE_NTOHL (0x4e4f524d),
+          ACE_NTOHL (0x4e4f524d), 
           ACE_NTOHL (0x414c0000),  // name = NORMAL
           7,
-          ACE_NTOHL (0x4d414e55),
+          ACE_NTOHL (0x4d414e55), 
           ACE_NTOHL (0x414c0000),  // name = MANUAL
           11,
-          ACE_NTOHL (0x5045525f),
-          ACE_NTOHL (0x434c4945),
+          ACE_NTOHL (0x5045525f), 
+          ACE_NTOHL (0x434c4945), 
           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
           11,
-          ACE_NTOHL (0x4155544f),
-          ACE_NTOHL (0x5f535441),
+          ACE_NTOHL (0x4155544f), 
+          ACE_NTOHL (0x5f535441), 
           ACE_NTOHL (0x52540000),  // name = AUTO_START
-
+          
         10,
-        ACE_NTOHL (0x61637469),
-        ACE_NTOHL (0x7661746f),
+        ACE_NTOHL (0x61637469), 
+        ACE_NTOHL (0x7661746f), 
         ACE_NTOHL (0x72000000),  // name = activator
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
       9,
-      ACE_NTOHL (0x6c6f6361),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x6c6f6361), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = location
             CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         41,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f416464),
-        ACE_NTOHL (0x72657373),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f416464), 
+        ACE_NTOHL (0x72657373), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
                 8,
-        ACE_NTOHL (0x41646472),
+        ACE_NTOHL (0x41646472), 
         ACE_NTOHL (0x65737300),  // name = Address
-                CORBA::tk_string,
+                CORBA::tk_string, 
         0U, // string length
 
 
@@ -1946,7 +1946,7 @@ namespace ImplementationRepository
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Administration_ptr
-TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_duplicate (
     ImplementationRepository::Administration_ptr p
   )
 {
@@ -1955,7 +1955,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::Administration>::release (
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_release (
     ImplementationRepository::Administration_ptr p
   )
 {
@@ -1964,14 +1964,14 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::Administration_ptr
-TAO::Objref_Traits<ImplementationRepository::Administration>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_nil (void)
 {
   return ImplementationRepository::Administration::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal (
     ImplementationRepository::Administration_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1980,7 +1980,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2002,37 +2002,37 @@ void ImplementationRepository::Administration::activate_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       },
-
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2041,7 +2041,7 @@ void ImplementationRepository::Administration::activate_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
       2
@@ -2068,39 +2068,39 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_check_startup (check_startup);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_check_startup
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       },
-
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2109,14 +2109,14 @@ char * ImplementationRepository::Administration::activate_server_with_startup (
       28,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata,
       2
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -2138,39 +2138,39 @@ void ImplementationRepository::Administration::register_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/AlreadyRegistered:1.0",
         ImplementationRepository::AlreadyRegistered::_alloc,
         ImplementationRepository::_tc_AlreadyRegistered
       },
-
+      
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2179,7 +2179,7 @@ void ImplementationRepository::Administration::register_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_register_server_exceptiondata,
       2
@@ -2206,39 +2206,39 @@ void ImplementationRepository::Administration::reregister_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/AlreadyRegistered:1.0",
         ImplementationRepository::AlreadyRegistered::_alloc,
         ImplementationRepository::_tc_AlreadyRegistered
       },
-
+      
       {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2247,7 +2247,7 @@ void ImplementationRepository::Administration::reregister_server (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_reregister_server_exceptiondata,
       2
@@ -2272,23 +2272,23 @@ void ImplementationRepository::Administration::remove_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2296,7 +2296,7 @@ void ImplementationRepository::Administration::remove_server (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2305,7 +2305,7 @@ void ImplementationRepository::Administration::remove_server (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
       1
@@ -2330,23 +2330,23 @@ void ImplementationRepository::Administration::shutdown_server (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2354,7 +2354,7 @@ void ImplementationRepository::Administration::shutdown_server (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2363,7 +2363,7 @@ void ImplementationRepository::Administration::shutdown_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
       1
@@ -2390,17 +2390,17 @@ void ImplementationRepository::Administration::server_is_running (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2408,9 +2408,9 @@ void ImplementationRepository::Administration::server_is_running (
       &_tao_addr,
       &_tao_server_object
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2418,7 +2418,7 @@ void ImplementationRepository::Administration::server_is_running (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2427,7 +2427,7 @@ void ImplementationRepository::Administration::server_is_running (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
       1
@@ -2452,23 +2452,23 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2476,7 +2476,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2485,7 +2485,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
       23,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
       1
@@ -2511,25 +2511,25 @@ void ImplementationRepository::Administration::find (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_info
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_find_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2537,7 +2537,7 @@ void ImplementationRepository::Administration::find (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2546,7 +2546,7 @@ void ImplementationRepository::Administration::find (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_find_exceptiondata,
       1
@@ -2572,17 +2572,17 @@ void ImplementationRepository::Administration::list (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -2590,7 +2590,7 @@ void ImplementationRepository::Administration::list (
       &_tao_server_list,
       &_tao_server_iterator
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2599,7 +2599,7 @@ void ImplementationRepository::Administration::list (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2618,19 +2618,19 @@ void ImplementationRepository::Administration::shutdown_repo (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2639,7 +2639,7 @@ void ImplementationRepository::Administration::shutdown_repo (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2660,23 +2660,23 @@ char * ImplementationRepository::Administration::find_ior (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_object_name (object_name);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_object_name
     };
-
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
@@ -2684,7 +2684,7 @@ char * ImplementationRepository::Administration::find_ior (
         ImplementationRepository::_tc_NotFound
       }
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2693,14 +2693,14 @@ char * ImplementationRepository::Administration::find_ior (
       8,
       this->the_TAO_Administration_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_find_ior_exceptiondata,
       1
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -2723,7 +2723,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void
+void 
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *_tao_tmp_pointer =
@@ -2768,7 +2768,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2818,22 +2818,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e3a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
     15,
-  ACE_NTOHL (0x41646d69),
-  ACE_NTOHL (0x6e697374),
-  ACE_NTOHL (0x72617469),
+  ACE_NTOHL (0x41646d69), 
+  ACE_NTOHL (0x6e697374), 
+  ACE_NTOHL (0x72617469), 
   ACE_NTOHL (0x6f6e0000),  // name = Administration
   };
 
@@ -2858,7 +2858,7 @@ namespace ImplementationRepository
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate (
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_duplicate (
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
@@ -2867,7 +2867,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplica
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release (
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_release (
     ImplementationRepository::ServerInformationIterator_ptr p
   )
 {
@@ -2876,14 +2876,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void)
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_nil (void)
 {
   return ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal (
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_marshal (
     ImplementationRepository::ServerInformationIterator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2892,7 +2892,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2913,23 +2913,23 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_how_many,
       &_tao_server_list
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2938,10 +2938,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
       6,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -2959,19 +2959,19 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2980,7 +2980,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
       7,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3004,7 +3004,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *_tao_tmp_pointer =
@@ -3049,7 +3049,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -3099,28 +3099,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4974),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x6f723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4974), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x6f723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
     26,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e497465),
-  ACE_NTOHL (0x7261746f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e497465), 
+  ACE_NTOHL (0x7261746f), 
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
   };
 
@@ -3193,7 +3193,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -3203,12 +3203,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -3219,7 +3219,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -3278,7 +3278,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -3288,12 +3288,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -3304,7 +3304,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -3363,7 +3363,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -3373,12 +3373,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
+  
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -3389,7 +3389,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-
+  
   return 1;
 }
 
@@ -3448,7 +3448,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3506,7 +3506,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3588,11 +3588,11 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
         _tao_any,
         ImplementationRepository::_tc_ActivationMode,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3650,7 +3650,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3708,7 +3708,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -3894,21 +3894,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -4048,20 +4048,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -4071,7 +4071,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -4081,28 +4081,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -4121,12 +4121,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = static_cast<ImplementationRepository::ActivationMode> (_tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -4198,20 +4198,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -4221,7 +4221,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -4231,28 +4231,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
@@ -4276,21 +4276,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -4312,21 +4312,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-
+  
   if ((strm >> obj.inout ()) == 0)
     {
       return 0;
     }
-
+  
   typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
-
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
-
+    
   return 1;
 }
 
@@ -4362,7 +4362,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::ServerObject
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::ServerObject
@@ -4604,7 +4604,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::ServerInformationIterator
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::ServerInformationIterator
@@ -4651,7 +4651,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         ImplementationRepository::Administration
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         ImplementationRepository::Administration
@@ -4696,7 +4696,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::ServerObject
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::ServerObject
@@ -4938,7 +4938,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::ServerInformationIterator
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::ServerInformationIterator
@@ -4985,7 +4985,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         ImplementationRepository::Administration
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         ImplementationRepository::Administration
@@ -5001,4 +5001,5 @@ CORBA::Boolean operator>> (
         ImplementationRepository::Administration \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 099445a71e4..dcbe6abf993 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -49,7 +49,6 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/SystemException.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -74,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -90,22 +89,22 @@ namespace TAO
 
 namespace ImplementationRepository
 {
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_
-
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerObject
       >
     ServerObject_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerObject
@@ -113,13 +112,13 @@ namespace ImplementationRepository
     ServerObject_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-
+  
   class TAO_PortableServer_Export ServerObject
     : public virtual CORBA::Object
   {
@@ -127,74 +126,74 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<ServerObject>;
     typedef ServerObject_ptr _ptr_type;
     typedef ServerObject_var _var_type;
-
+    
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-
+    
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerObject_ptr _nil (void)
     {
       return (ServerObject_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     ServerObject (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerObject_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     ServerObject (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     ServerObject (
         TAO_Stub *objref,
@@ -202,41 +201,41 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~ServerObject (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerObject (const ServerObject &);
-
+    
     void operator= (const ServerObject &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-
+  
   class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
-
+    
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static AlreadyRegistered *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -248,44 +247,44 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-
+  
   class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
   {
   public:
-
+    
     TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static CannotActivate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -297,50 +296,50 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     CannotActivate (
         const char * _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-
+  
   class TAO_PortableServer_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -352,87 +351,87 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-
+  
   struct EnvironmentVariable;
-
+  
   typedef
     TAO_Var_Var_T<
         EnvironmentVariable
       >
     EnvironmentVariable_var;
-
+  
   typedef
     TAO_Out_T<
         EnvironmentVariable,
         EnvironmentVariable_var
       >
     EnvironmentVariable_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_PortableServer_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager value;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:376
-
+  
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-
+  
   class EnvironmentList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         EnvironmentList,
         EnvironmentVariable
       >
     EnvironmentList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         EnvironmentList,
@@ -440,7 +439,7 @@ namespace ImplementationRepository
         EnvironmentVariable
       >
     EnvironmentList_out;
-
+  
   class TAO_PortableServer_Export EnvironmentList
     : public
         TAO_Unbounded_Sequence<
@@ -453,27 +452,27 @@ namespace ImplementationRepository
     EnvironmentList (
         CORBA::ULong max,
         CORBA::ULong length,
-        EnvironmentVariable* buffer,
+        EnvironmentVariable* buffer, 
         CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef EnvironmentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum ActivationMode
   {
     NORMAL,
@@ -481,39 +480,39 @@ namespace ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-
+  
   typedef ActivationMode &ActivationMode_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-
+  
   struct StartupOptions;
-
+  
   typedef
     TAO_Var_Var_T<
         StartupOptions
       >
     StartupOptions_var;
-
+  
   typedef
     TAO_Out_T<
         StartupOptions,
         StartupOptions_var
       >
     StartupOptions_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_PortableServer_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
@@ -521,64 +520,64 @@ namespace ImplementationRepository
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager activator;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
-
+  
   struct ServerInformation;
-
+  
   typedef
     TAO_Var_Var_T<
         ServerInformation
       >
     ServerInformation_var;
-
+  
   typedef
     TAO_Out_T<
         ServerInformation,
         ServerInformation_var
       >
     ServerInformation_out;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_PortableServer_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
     TAO_String_Manager location;
   };
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-
+  
   class ServerInformationList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ServerInformationList,
         ServerInformation
       >
     ServerInformationList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ServerInformationList,
@@ -586,7 +585,7 @@ namespace ImplementationRepository
         ServerInformation
       >
     ServerInformationList_out;
-
+  
   class TAO_PortableServer_Export ServerInformationList
     : public
         TAO_Unbounded_Sequence<
@@ -599,39 +598,39 @@ namespace ImplementationRepository
     ServerInformationList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServerInformation* buffer,
+        ServerInformation* buffer, 
         CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ServerInformationList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
-
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerInformationIterator
       >
     ServerInformationIterator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerInformationIterator
@@ -639,22 +638,22 @@ namespace ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:611
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
-
+  
   class Administration;
   typedef Administration *Administration_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Administration
       >
     Administration_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Administration
@@ -662,13 +661,13 @@ namespace ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-
+  
   class TAO_PortableServer_Export Administration
     : public virtual CORBA::Object
   {
@@ -676,30 +675,30 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<Administration>;
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
-
+    
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-
+    
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Administration_ptr _nil (void)
     {
       return (Administration_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -709,10 +708,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * activate_server_with_startup (
         const char * server,
         ::CORBA::Long check_startup
@@ -723,10 +722,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void register_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -737,10 +736,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void reregister_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -751,10 +750,10 @@ namespace ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -763,10 +762,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -775,10 +774,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_running (
         const char * server,
         const char * addr,
@@ -789,10 +788,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -801,10 +800,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
@@ -814,10 +813,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -827,20 +826,20 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void shutdown_repo (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * find_ior (
         const char * object_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -849,34 +848,34 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Administration (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     Administration (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Administration (
         TAO_Stub *objref,
@@ -884,29 +883,29 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Administration (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Administration (const Administration &);
-
+    
     void operator= (const Administration &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-
+  
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual CORBA::Object
   {
@@ -914,30 +913,30 @@ namespace ImplementationRepository
     friend class TAO::Narrow_Utils<ServerInformationIterator>;
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
-
+    
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-
+    
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerInformationIterator_ptr _nil (void)
     {
       return (ServerInformationIterator_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list
@@ -946,44 +945,44 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     ServerInformationIterator (void);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (void);
-
+    
     // Concrete non-local interface only.
     ServerInformationIterator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     ServerInformationIterator (
         TAO_Stub *objref,
@@ -991,21 +990,21 @@ namespace ImplementationRepository
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~ServerInformationIterator (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerInformationIterator (const ServerInformationIterator &);
-
+    
     void operator= (const ServerInformationIterator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 
 // TAO_IDL - Generated from
@@ -1045,18 +1044,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerObject>
   {
-    static ImplementationRepository::ServerObject_ptr duplicate (
+    static ImplementationRepository::ServerObject_ptr tao_duplicate (
         ImplementationRepository::ServerObject_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::ServerObject_ptr
       );
-    static ImplementationRepository::ServerObject_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::ServerObject_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::ServerObject_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1066,18 +1065,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerInformationIterator>
   {
-    static ImplementationRepository::ServerInformationIterator_ptr duplicate (
+    static ImplementationRepository::ServerInformationIterator_ptr tao_duplicate (
         ImplementationRepository::ServerInformationIterator_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::ServerInformationIterator_ptr
       );
-    static ImplementationRepository::ServerInformationIterator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::ServerInformationIterator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::ServerInformationIterator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1087,18 +1086,18 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Administration>
   {
-    static ImplementationRepository::Administration_ptr duplicate (
+    static ImplementationRepository::Administration_ptr tao_duplicate (
         ImplementationRepository::Administration_ptr
       );
-    static void release (
+    static void tao_release (
         ImplementationRepository::Administration_ptr
       );
-    static ImplementationRepository::Administration_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ImplementationRepository::Administration_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         ImplementationRepository::Administration_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -1296,7 +1295,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:976
 
 #if defined (__ACE_INLINE__)
-#include "ImplRepoC.inl"
+#include "ImplRepoC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -1310,3 +1309,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
new file mode 100644
index 00000000000..36cc19fe639
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -0,0 +1,136 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
+
+ACE_INLINE
+ImplementationRepository::ServerObject::ServerObject (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_ServerObject_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_ServerObject_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::ServerObject::ServerObject (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_ServerObject_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
+#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
+
+ACE_INLINE
+ImplementationRepository::Administration::Administration (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_Administration_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_Administration_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::Administration::Administration (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_Administration_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:70
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
+
+ACE_INLINE
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_ServerInformationIterator_setup_collocation ();
+}
+
+ACE_INLINE
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
+    IOP::IOR *ior,
+    TAO_ORB_Core *oc
+  )
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+{
+}
+
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index ebc7d0a163e..033fa1df0b4 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:629
 
 #ifndef _TAO_IDL_IMPLREPOS_CPP_
@@ -67,7 +67,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "ImplRepoS.inl"
+#include "ImplRepoS.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -79,7 +79,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -93,13 +93,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -112,13 +112,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:618
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -131,13 +131,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -153,7 +153,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index a7fc6e3a573..f3d282459c7 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -59,109 +59,109 @@
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
   class _TAO_ServerObject_ThruPOA_Proxy_Impl;
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerObject
     : public virtual PortableServer::ServantBase
   {
   protected:
     ServerObject (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::ServerObject _stub_type;
     typedef ::ImplementationRepository::ServerObject_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::ServerObject_var _stub_var_type;
-
+    
     ServerObject (const ServerObject& rhs);
     virtual ~ServerObject (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::ServerObject *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void ping_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void shutdown_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -169,29 +169,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerObject_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -204,33 +204,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_ServerObject_Strategized_Proxy_Broker *
     the_TAO_ServerObject_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     ping (
         TAO_Abstract_ServantBase *servant,
@@ -241,10 +241,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown (
         TAO_Abstract_ServantBase *servant,
@@ -256,28 +256,28 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerObject_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     ping (
         TAO_Abstract_ServantBase *servant,
@@ -288,10 +288,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown (
         TAO_Abstract_ServantBase *servant,
@@ -303,90 +303,90 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
-
+  
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class Administration;
   typedef Administration *Administration_ptr;
-
+  
   class _TAO_Administration_ThruPOA_Proxy_Impl;
   class _TAO_Administration_Direct_Proxy_Impl;
   class _TAO_Administration_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Administration
     : public virtual PortableServer::ServantBase
   {
   protected:
     Administration (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::Administration _stub_type;
     typedef ::ImplementationRepository::Administration_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::Administration_var _stub_var_type;
-
+    
     Administration (const Administration& rhs);
     virtual ~Administration (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::Administration *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -396,17 +396,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     static void activate_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual char * activate_server_with_startup (
         const char * server,
         ::CORBA::Long check_startup
@@ -417,17 +417,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
-
+    
     static void activate_server_with_startup_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void register_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -438,17 +438,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void register_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void reregister_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
@@ -459,17 +459,17 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void reregister_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -478,17 +478,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void remove_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -497,17 +497,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void shutdown_server_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_running (
         const char * server,
         const char * addr,
@@ -518,17 +518,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_running_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -537,17 +537,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void server_is_shutting_down_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
@@ -557,17 +557,17 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void find_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -577,34 +577,34 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void list_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void shutdown_repo (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void shutdown_repo_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual char * find_ior (
         const char * object_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -613,7 +613,7 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
-
+    
     static void find_ior_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -621,29 +621,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Administration_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -656,33 +656,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_Administration_Strategized_Proxy_Broker *
     the_TAO_Administration_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Administration_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server (
         TAO_Abstract_ServantBase *servant,
@@ -695,10 +695,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_with_startup (
         TAO_Abstract_ServantBase *servant,
@@ -711,10 +711,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_server (
         TAO_Abstract_ServantBase *servant,
@@ -727,10 +727,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     reregister_server (
         TAO_Abstract_ServantBase *servant,
@@ -743,10 +743,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server (
         TAO_Abstract_ServantBase *servant,
@@ -758,10 +758,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server (
         TAO_Abstract_ServantBase *servant,
@@ -773,10 +773,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running (
         TAO_Abstract_ServantBase *servant,
@@ -788,10 +788,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down (
         TAO_Abstract_ServantBase *servant,
@@ -803,10 +803,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find (
         TAO_Abstract_ServantBase *servant,
@@ -818,10 +818,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     list (
         TAO_Abstract_ServantBase *servant,
@@ -832,10 +832,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_repo (
         TAO_Abstract_ServantBase *servant,
@@ -846,10 +846,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_ior (
         TAO_Abstract_ServantBase *servant,
@@ -862,28 +862,28 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl
   {
   public:
     _TAO_Administration_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server (
         TAO_Abstract_ServantBase *servant,
@@ -896,10 +896,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     activate_server_with_startup (
         TAO_Abstract_ServantBase *servant,
@@ -912,10 +912,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     register_server (
         TAO_Abstract_ServantBase *servant,
@@ -928,10 +928,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     reregister_server (
         TAO_Abstract_ServantBase *servant,
@@ -944,10 +944,10 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     remove_server (
         TAO_Abstract_ServantBase *servant,
@@ -959,10 +959,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_server (
         TAO_Abstract_ServantBase *servant,
@@ -974,10 +974,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_running (
         TAO_Abstract_ServantBase *servant,
@@ -989,10 +989,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     server_is_shutting_down (
         TAO_Abstract_ServantBase *servant,
@@ -1004,10 +1004,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find (
         TAO_Abstract_ServantBase *servant,
@@ -1019,10 +1019,10 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     list (
         TAO_Abstract_ServantBase *servant,
@@ -1033,10 +1033,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     shutdown_repo (
         TAO_Abstract_ServantBase *servant,
@@ -1047,10 +1047,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     find_ior (
         TAO_Abstract_ServantBase *servant,
@@ -1063,90 +1063,90 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
-
+  
+  
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
   class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
   class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
   class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual PortableServer::ServantBase
   {
   protected:
     ServerInformationIterator (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::ServerInformationIterator _stub_type;
     typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type;
-
+    
     ServerInformationIterator (const ServerInformationIterator& rhs);
     virtual ~ServerInformationIterator (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::ImplementationRepository::ServerInformationIterator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list
@@ -1155,24 +1155,24 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void next_n_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -1180,29 +1180,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -1215,33 +1215,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *
     the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     next_n (
         TAO_Abstract_ServantBase *servant,
@@ -1252,10 +1252,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -1267,28 +1267,28 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     next_n (
         TAO_Abstract_ServantBase *servant,
@@ -1299,10 +1299,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -1314,24 +1314,24 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 
 // TAO_IDL - Generated from
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1012
 
 
 #if defined (__ACE_INLINE__)
-#include "ImplRepoS.inl"
+#include "ImplRepoS.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i
new file mode 100644
index 00000000000..1d2df31bd57
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplRepoS.i
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
new file mode 100644
index 00000000000..d34fb729be7
--- /dev/null
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
@@ -0,0 +1,102 @@
+#include "ObjectReferenceTemplate.h"
+#include "POA.h"
+
+#include "tao/CORBA_String.h"
+#include "tao/ORB_Constants.h"
+
+
+ACE_RCSID (PortableServer,
+           ObjectReferenceTemplate,
+           "$Id$")
+
+
+#if !defined (__ACE_INLINE__)
+# include "ObjectReferenceTemplate.inl"
+#endif /* ! __ACE_INLINE__ */
+
+
+TAO_ObjectReferenceTemplate::TAO_ObjectReferenceTemplate (
+  const char *server_id,
+  const char *orb_id,
+  TAO_POA * poa)
+  : server_id_ (server_id),
+    orb_id_ (orb_id),
+    poa_ (poa)
+{
+}
+
+TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void)
+{
+}
+
+char *
+TAO_ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::string_dup (this->server_id_);
+}
+
+char *
+TAO_ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::string_dup (this->orb_id_);
+}
+
+PortableInterceptor::AdapterName *
+TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableInterceptor::AdapterName *adapter_name = 0;
+
+  if (this->adapter_name_ != 0)
+    {
+      ACE_NEW_THROW_EX (adapter_name,
+                        PortableInterceptor::AdapterName (
+                          *(this->adapter_name_)),
+                        CORBA::NO_MEMORY (
+                           CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                           CORBA::COMPLETED_NO));
+      ACE_CHECK_RETURN (0);
+
+      return adapter_name;
+    }
+  else
+    {
+      if (this->poa_ == 0)
+        ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+
+      this->adapter_name_ =
+        this->poa_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      ACE_NEW_THROW_EX (adapter_name,
+                        PortableInterceptor::AdapterName (
+                          *(this->adapter_name_)),
+                        CORBA::NO_MEMORY (
+                           CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                           CORBA::COMPLETED_NO));
+      ACE_CHECK_RETURN (0);
+
+      return adapter_name;
+    }
+}
+
+CORBA::Object_ptr
+TAO_ObjectReferenceTemplate::make_object (
+    const char *,
+    const PortableInterceptor::ObjectId &
+  ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ))
+{
+  if (this->poa_ == 0)
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ());
+
+  return this->poa_->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
new file mode 100644
index 00000000000..6d805313cf7
--- /dev/null
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
@@ -0,0 +1,127 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file ObjectReferenceTemplate.h
+ *
+ * $Id$
+ *
+ * This is the implementation of the
+ * PortableInterceptor::ObjectReferenceTemplate ValueType.
+ *
+ * @author Priyanka Gontla <gontla_p@ociweb.com>
+ */
+//=============================================================================
+
+#ifndef TAO_OBJECT_REFERENCE_TEMPLATE_H
+#define TAO_OBJECT_REFERENCE_TEMPLATE_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PortableServer/portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Default_ORTC.h"
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class TAO_POA;
+
+/**
+ * @class TAO_ObjectReferenceTemplate
+ *
+ * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate
+ *        interface.
+ */
+class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
+  : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate,
+    public virtual CORBA::DefaultValueRefCountBase
+{
+public:
+
+  /// Constructor
+  TAO_ObjectReferenceTemplate (const char *server_id,
+                               const char *orb_id,
+                               TAO_POA *poa);
+
+  /**
+   * @name PortableInterceptor::ObjectReferenceTemplate Methods
+   *
+   * Methods required by the
+   * PortableInterceptor::ObjectReferenceTemplate ValueType.
+   */
+  //@{
+  virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableInterceptor::AdapterName * adapter_name (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
+
+  /**
+   * @name PortableInterceptor::ObjectReferenceFactory Methods
+   *
+   * Methods required by the
+   * PortableInterceptor::ObjectReferenceFactory ValueType.
+   */
+  //@{
+  virtual CORBA::Object_ptr make_object (
+      const char * repository_id,
+      const PortableInterceptor::ObjectId & id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  //@}
+
+  /// Set the underlying POA pointer.
+  /**
+   * Upon destruction of the POA that this ObjectReferenceTemplate is
+   * associated with, the underlying POA pointer will be set to zero
+   * to forcibly break all ties with the POA.  This is necessary to
+   * prevent this ObjectReferenceTemplate from invoking the POA after
+   * it has been destroyed.
+   */
+  void poa (TAO_POA * poa);
+
+protected:
+
+  /// Destructor
+  /**
+   * Protected destructor to enforce proper memory management via
+   * reference counting.
+   */
+  ~TAO_ObjectReferenceTemplate (void);
+
+private:
+
+  const char *server_id_;
+  const char *orb_id_;
+  PortableInterceptor::AdapterName_var adapter_name_;
+  TAO_POA *poa_;
+
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__ACE_INLINE__)
+# include "ObjectReferenceTemplate.inl"
+#endif /* ! __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_OBJECT_REFERENCE_TEMPLATE_H */
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.inl b/TAO/tao/PortableServer/ObjectReferenceTemplate.inl
new file mode 100644
index 00000000000..14de581cafc
--- /dev/null
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.inl
@@ -0,0 +1,9 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE void
+TAO_ObjectReferenceTemplate::poa (TAO_POA * poa)
+{
+  this->poa_ = poa;
+}
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index e51bd87f527..d1cb1630b7f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "tao/SystemException.h"
-
 
 ACE_INLINE
 TAO_POA_Current::TAO_POA_Current (void)
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 5ee4eb96c18..e8b042b4ab7 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -14,10 +14,10 @@ ACE_RCSID (PortableServer,
 
 #include "tao/StringSeqC.h"
 
+#include "tao/PortableServer/IORInfo.h"
+#include "tao/PortableServer/ObjectReferenceTemplate.h"
 #include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/PortableServer/ORT_Adapter.h"
-#include "tao/PortableServer/ORT_Adapter_Factory.h"
-#include "tao/PortableInterceptorC.h"
+
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -28,8 +28,8 @@ ACE_RCSID (PortableServer,
 #include "tao/Stub.h"
 #include "tao/Profile.h"
 #include "tao/TSS_Resources.h"
-#include "tao/IORInterceptor_Adapter.h"
 #include "tao/debug.h"
+#include "tao/IORInterceptor/IORInterceptor_List.h"
 #include "Default_Acceptor_Filter.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_sys_time.h"
@@ -41,7 +41,6 @@ ACE_RCSID (PortableServer,
 
 // auto_ptr class
 #include "ace/Auto_Ptr.h"
-#include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
 # include "POA.i"
@@ -172,14 +171,10 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 void
 TAO_POA::set_obj_ref_factory (
   PortableInterceptor::ObjectReferenceFactory *current_factory
-  ACE_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      // Activate a different factory
-      this->ort_adapter_->set_obj_ref_factory (current_factory
-                                               ACE_ENV_ARG_PARAMETER);
-    }
+  CORBA::add_ref (current_factory);
+  this->obj_ref_factory_ = current_factory;
 }
 
 TAO_POA::TAO_POA (const TAO_POA::String &name,
@@ -199,7 +194,6 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     policies_ (policies),
     parent_ (parent),
     active_object_map_ (0),
-    ort_adapter_ (0),
     adapter_state_ (PortableInterceptor::HOLDING),
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -351,6 +345,22 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
+
+  // Create an ObjectReferenceTemplate for this POA.
+  ACE_NEW_THROW_EX (this->def_ort_template_,
+                    TAO_ObjectReferenceTemplate (
+                      this->orb_core_.server_id (),
+                      this->orb_core_.orbid (),
+                      this),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  this->ort_template_ = this->def_ort_template_;
+
+  // Must increase ref count since this->obj_ref_factory_ will
+  // descrease it upon destruction.
+  CORBA::add_ref (this->ort_template_.in ());
+  this->obj_ref_factory_ = this->ort_template_;
 }
 
 TAO_POA::~TAO_POA (void)
@@ -366,7 +376,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
   // Delete the active object map.
   delete this->active_object_map_;
-  active_object_map_ = 0;
 
   // Remove POA from the POAManager.
   int result = this->poa_manager_.remove_poa (this);
@@ -417,17 +426,6 @@ TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 
   }
 
-  if (this->ort_adapter_ != 0)
-  {
-    TAO::ORT_Adapter_Factory *ort_factory =
-      this->ORT_adapter_factory ();
-
-    ort_factory->destroy (this->ort_adapter_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->ort_adapter_ = 0;
-  }
-
   CORBA::release (this);
 }
 
@@ -733,12 +731,11 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
         }
     }
 
-  TAO::ORT_Array array_obj_ref_template;
+  PortableInterceptor::ObjectReferenceTemplateSeq seq_obj_ref_template;
 
   CORBA::ULong i = 0;
 
-  // Gather all ObjectReferenceTemplates and change all adapter states
-  // to inactivate
+  //  Remove all children POAs
   for (CHILDREN::iterator iterator = this->children_.begin ();
        iterator != this->children_.end ();
        ++iterator)
@@ -747,47 +744,35 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       // Get the adapter template related to the ChildPOA
       PortableInterceptor::ObjectReferenceTemplate *child_at =
-        child_poa->get_adapter_template_i ();
+        child_poa->get_adapter_template ();
 
-      // In case no ORT library is linked we get zero
-      if (child_at != 0)
-        {
-          // Add it to the sequence of object reference templates that
-          // will be destroyed.
-          array_obj_ref_template.size (i + 1);
+      CORBA::add_ref (child_at);
 
-          array_obj_ref_template[i] = child_at;
-        }
+      // Add it to the sequence of object reference templates that
+      // will be destroyed.
+      seq_obj_ref_template.length (i + 1);
 
-      child_poa->adapter_state_ =
-        PortableInterceptor::INACTIVE;
+      seq_obj_ref_template[i] = child_at;
 
-      ++i;
-    }
+      child_poa->adapter_state_ = PortableInterceptor::INACTIVE;
 
-  // Notify the state changes to the IORInterceptors
-  this->adapter_state_changed (array_obj_ref_template,
-                               PortableInterceptor::INACTIVE
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      child_poa->adapter_state_changed (seq_obj_ref_template,
+                                        child_poa->adapter_state_
+                                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
 
-  // Destroy all child POA's now.
-  for (CHILDREN::iterator destroy_iterator = this->children_.begin ();
-       destroy_iterator != this->children_.end ();
-       ++destroy_iterator)
-    {
-      TAO_POA *destroy_child_poa = (*destroy_iterator).int_id_;
+      ++i;
 
-      destroy_child_poa->destroy_i (etherealize_objects,
-                                    wait_for_completion
-                                    ACE_ENV_ARG_PARAMETER);
+      child_poa->destroy_i (etherealize_objects,
+                            wait_for_completion
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
   //
   // ImplRepo related.
   //
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   if (this->cached_policies_.lifespan () == PortableServer::PERSISTENT)
     {
       this->imr_notify_shutdown ();
@@ -840,21 +825,6 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
       (non_servant_upcall_in_progress == 0 ||
        &non_servant_upcall_in_progress->poa () != this))
     {
-      TAO::ORT_Array my_array_obj_ref_template;
-
-      // Get the adapter template
-      PortableInterceptor::ObjectReferenceTemplate *adapter =
-        this->get_adapter_template_i ();
-
-      if (adapter != 0)
-        {
-          // Add it to the sequence of object reference templates, we just notify
-          // for ourselves that we are now non_existent, our childs will do it
-          // for themselves.
-          array_obj_ref_template.size (1);
-          array_obj_ref_template[0] = adapter;
-        }
-
       // According to the ORT spec, after a POA is destroyed, its state
       // has to be changed to NON_EXISTENT and all the registered
       // interceptors are to be informed. Since, the POA is destroyed
@@ -868,10 +838,14 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
 
-      this->adapter_state_changed (array_obj_ref_template,
+      this->adapter_state_changed (seq_obj_ref_template,
                                    this->adapter_state_
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
+
+      // Break all ties between the ObjectReferenceTemplate and this
+      // POA.
+      this->def_ort_template_->poa (0);
     }
   else
     {
@@ -1043,19 +1017,31 @@ TAO_POA::add_ior_component_to_profile (
 
 void
 TAO_POA::adapter_state_changed (
-   const TAO::ORT_Array &array_obj_ref_template,
+   const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
    PortableInterceptor::AdapterState state
    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
+  /// First get a list of all the interceptors.
+  TAO_IORInterceptor_List * interceptor_list =
+    this->orb_core_.ior_interceptor_list ();
 
-  if (ior_adapter)
+  if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE & interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
+
+  for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ior_adapter->adapter_state_changed (array_obj_ref_template,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
+      interceptors[i]->adapter_state_changed (seq_obj_ref_template,
+                                              state
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -1069,8 +1055,7 @@ TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   // This operation requires the USE_SERVANT_MANAGER policy; if not
   // present, the WrongPolicy exception is raised.
-  if (this->cached_policies_.request_processing () !=
-      PortableServer::USE_SERVANT_MANAGER)
+  if (this->cached_policies_.request_processing () != PortableServer::USE_SERVANT_MANAGER)
     {
       ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
                         PortableServer::ServantManager::_nil ());
@@ -1079,8 +1064,7 @@ TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
   // This operation returns the servant manager associated with the
   // POA.  If no servant manager has been associated with the POA, it
   // returns a null reference.
-  if (this->cached_policies_.servant_retention () ==
-      PortableServer::RETAIN)
+  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
   else
     return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
@@ -1937,32 +1921,14 @@ TAO_POA::create_reference_i (const char *intf,
                                    1,
                                    priority);
 
-  return this->invoke_key_to_object_helper_i (intf,
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_POA::invoke_key_to_object_helper_i (const char * repository_id,
-                                        const PortableServer::ObjectId & id
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
   const PortableInterceptor::ObjectId &user_oid =
-    reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
+    ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                          user_id);
 
   // Ask the ORT to create the object.
-  if (this->ORT_adapter_i ())
-    {
-      // Ask the ORT to create the object.
-      return this->ort_adapter_->make_object (repository_id,
+  return this->obj_ref_factory_->make_object (intf,
                                               user_oid
                                               ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
 }
 
 CORBA::Object_ptr
@@ -2039,8 +2005,13 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                    1,
                                    priority);
 
-  return this->invoke_key_to_object_helper_i (intf,
-                                              user_id
+  const PortableInterceptor::ObjectId &user_oid =
+    ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                          user_id);
+
+  // Ask the ORT to create the object.
+  return this->obj_ref_factory_->make_object (intf,
+                                              user_oid
                                               ACE_ENV_ARG_PARAMETER);
 }
 
@@ -2282,14 +2253,19 @@ TAO_POA::servant_to_reference_i (PortableServer::Servant servant
                                    1,
                                    priority);
 
+  const PortableInterceptor::ObjectId &user_oid =
+    ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                          user_id);
+
   // Ask the ORT to create the object.
   // @@NOTE:There is a possible deadlock lurking here. We held the
   // lock, and we are possibly trying to make a call into the
   // application code. Think what would happen if the app calls us
   // back. We need to get to this at some point.
-  return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
+  return this->obj_ref_factory_->make_object (
+    servant->_interface_repository_id (),
+    user_oid
+    ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::Servant
@@ -2629,8 +2605,13 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
                                        1,
                                        priority);
 
-      return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                                  id
+      const PortableInterceptor::ObjectId &user_oid =
+        ACE_reinterpret_cast (const PortableInterceptor::ObjectId &,
+                              id);
+
+      // Ask the ORT to create the object.
+      return this->obj_ref_factory_->make_object (servant->_interface_repository_id (),
+                                                  user_oid
                                                   ACE_ENV_ARG_PARAMETER);
     }
   else
@@ -3759,26 +3740,127 @@ TAO_POA::key_to_stub_i (const TAO::ObjectKey &key,
 void
 TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  /// First get a list of all the interceptors.
+  TAO_IORInterceptor_List * interceptor_list =
+    this->orb_core_.ior_interceptor_list ();
+
+  if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE & interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
 
-  if (ior_adapter)
+  TAO_IORInfo *tao_info = 0;
+  ACE_NEW_THROW_EX (tao_info,
+                    TAO_IORInfo (this),
+                    CORBA::NO_MEMORY (
+                       CORBA::SystemException::_tao_minor_code (
+                          TAO_DEFAULT_MINOR_CODE,
+                          ENOMEM),
+                       CORBA::COMPLETED_NO));
+  ACE_CHECK;
+
+  PortableInterceptor::IORInfo_var info = tao_info;
+
+  // Release the POA during IORInterceptor calls to avoid potential
+  // deadlocks.
+  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
+  ACE_UNUSED_ARG (non_servant_upcall);
+
+  for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER);
+      ACE_TRY
+        {
+          interceptors[i]->establish_components (info.in ()
+                                                 ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          // According to the Portable Interceptors specification,
+          // IORInterceptor::establish_components() must not throw an
+          // exception.  If it does, then the ORB is supposed to
+          // ignore it and continue processing the remaining
+          // IORInterceptors.
+          if (TAO_debug_level > 1)
+            {
+              CORBA::String_var name = interceptors[i]->name (
+                ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+              // @@ What do we do if we get an exception here?
+
+              if (name.in () != 0)
+                {
+                  ACE_DEBUG ((LM_WARNING,
+                              "(%P|%t) Exception thrown while processing "
+                              "IORInterceptor \"%s\">\n",
+                              ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
+                }
+
+              ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
+                                       "Ignoring exception in "
+                                       "IORInterceptor::establish_components");
+            }
+        }
+      ACE_ENDTRY;
       ACE_CHECK;
     }
+
+  tao_info->components_established ();
+
+  this->components_established (info.in ()
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // The IORInfo instance is no longer valid.  Invalidate it to
+  // prevent the user from peforming "illegal" operations.
+  tao_info->invalidate ();
 }
 
 void
 TAO_POA::components_established (PortableInterceptor::IORInfo_ptr info
                                  ACE_ENV_ARG_DECL)
 {
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  TAO_IORInterceptor_List * interceptor_list =
+    this->orb_core_.ior_interceptor_list ();
 
-  if (ior_adapter)
+    if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE & interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  // All the establish_components() interception points have been
+  // invoked. Now call the components_established() interception point
+  // on all the IORInterceptors.
+  for (size_t j = 0; j < interceptor_count; ++j)
     {
-      ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER);
+      ACE_TRY
+        {
+          interceptors[j]->components_established (
+            info
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
+                                         CORBA::COMPLETED_NO));
+        }
+      ACE_ENDTRY;
       ACE_CHECK;
     }
 }
@@ -4088,82 +4170,6 @@ TAO_POA::imr_notify_shutdown (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-TAO::ORT_Adapter_Factory *
-TAO_POA::ORT_adapter_factory (void)
-{
-  return ACE_Dynamic_Service<TAO::ORT_Adapter_Factory>::instance (
-           TAO_POA::ort_adapter_factory_name ());
-}
-
-TAO::ORT_Adapter *
-TAO_POA::ORT_adapter_i (void)
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO::ORT_Adapter_Factory * ort_ap_factory =
-        this->ORT_adapter_factory ();
-
-      if (!ort_ap_factory)
-        return 0;
-
-      // Get the full adapter name of this POA, do this before we
-      // create the adapter so that in case this fails, we just
-      // return 0 and not a not activated adapter
-      PortableInterceptor::AdapterName *adapter_name =
-        this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->ort_adapter_ =
-          ort_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!ort_adapter_)
-        return 0;
-
-      // @todo We have to look at this, we activate it but hold the POA lock,
-      // in case we are called by ORT_adapter, we shouldn't keep the lock
-      // here, but then the ort_adapter should be guarded against multiple
-      // activations.
-      this->ort_adapter_->activate (this->orb_core_.server_id (),
-                                    this->orb_core_.orbid (),
-                                    adapter_name,
-                                    this
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return this->ort_adapter_;
-}
-
-TAO::ORT_Adapter *
-TAO_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  // DCL ..
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  return this->ORT_adapter_i ();
-}
-
 TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
                               ACE_ENV_ARG_DECL,
                               int check_for_destruction)
@@ -4298,53 +4304,6 @@ TAO_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id,
   this->priority_ = priority;
 }
 
-void
-TAO_POA::ort_adapter_factory_name (const char *name)
-{
-  TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_ =
-    name;
-}
-
-const char *
-TAO_POA::ort_adapter_factory_name (void)
-{
-  return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str();
-}
-
-// Initialize instance_ to 0, since this is what we test for in the call
-// to instance ().  Note that this does not require a constructor call, so
-// it is always initialized by the time that instance () can be called.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::instance_ = 0;
-
-// Force an instance to be created at module initialization time,
-// since we do not want to worry about double checked locking and
-// the race condition to initialize the lock.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ =
-  TAO_POA_Static_Resources::instance ();
-
-TAO_POA_Static_Resources*
-TAO_POA_Static_Resources::instance (void)
-{
-  if (TAO_POA_Static_Resources::instance_ == 0)
-    {
-      // This new is never freed on purpose.  The data specified by
-      // it needs to be around for the last shared library that references
-      // this class.  This could occur in a destructor in a shared library
-      // that is unloaded after this one.  One solution to avoid this
-      // harmless memory leak would be to use reference counting.
-      ACE_NEW_RETURN (TAO_POA_Static_Resources::instance_,
-                      TAO_POA_Static_Resources (),
-                      0);
-    }
-
-  return TAO_POA_Static_Resources::instance_;
-}
-
-TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
-  : ort_adapter_factory_name_ ("ORT_Adapter_Factory")
-{
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
@@ -4362,11 +4321,13 @@ template class ACE_Write_Guard<ACE_Lock>;
 template class ACE_Read_Guard<ACE_Lock>;
 template class ACE_Array_Base <IOP::ProfileId>;
 
+//template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class auto_ptr<TAO_Active_Object_Map>;
 
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
 #  endif  /* ACE_LACKS_AUTO_PTR */
 
@@ -4388,11 +4349,13 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Write_Guard<ACE_Lock>
 #pragma instantiate ACE_Read_Guard<ACE_Lock>
 
+//#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map>
 
 #  if defined (ACE_LACKS_AUTO_PTR) \
       || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
            && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
 #    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
 #  endif  /* ACE_LACKS_AUTO_PTR */
 
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 6de036d8770..a3c7f13b7b6 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -42,9 +42,12 @@
 #include "tao/LocalObject.h"
 
 // Portable Interceptor
-#include "tao/PI_ForwardC.h"
+#include "tao/PortableInterceptorC.h"
 
+// Map
 #include "ace/Hash_Map_Manager_T.h"
+
+// ACE_Array_Base
 #include "ace/Array_Base.h"
 
 // Locking
@@ -56,8 +59,6 @@
 // OctetSeq
 #include "tao/OctetSeqC.h"
 
-#include "ORT_Adapter.h"
-
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -67,11 +68,15 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+class TAO_Acceptor_Filter;
+class TAO_Acceptor_Registry;
 class TAO_Temporary_Creation_Time;
+class TAO_ObjectReferenceTemplate;
 
 class TAO_Creation_Time
 {
 public:
+
   TAO_Creation_Time (const ACE_Time_Value &creation_time);
 
   TAO_Creation_Time (void);
@@ -131,9 +136,6 @@ protected:
 
 // Forward Declaration
 class ServerObject_i;
-class TAO_Acceptor_Filter;
-class TAO_Acceptor_Registry;
-class TAO_IORInfo;
 
 namespace PortableInterceptor
 {
@@ -141,12 +143,6 @@ namespace PortableInterceptor
   typedef IORInfo *IORInfo_ptr;
 }
 
-namespace TAO
-{
-  class ORT_Adapter;
-  class ORT_Adapter_Factory;
-}
-
 /**
  * @class TAO_POA
  *
@@ -166,7 +162,7 @@ public:
   friend class TAO_POA_Current_Impl;
   friend class TAO_POA_Manager;
   friend class TAO_RT_Collocation_Resolver;
-  friend class TAO_IORInfo;
+  friend class TAO_ObjectReferenceTemplate;
 
   typedef ACE_CString String;
 
@@ -276,6 +272,20 @@ public:
   PortableInterceptor::AdapterName *adapter_name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Accessor methods to ObjectReferenceTemplate
+  PortableInterceptor::ObjectReferenceTemplate * get_adapter_template (void);
+
+  void set_adapter_template (PortableInterceptor::ObjectReferenceTemplate *
+                             object_ref_template
+                             ACE_ENV_ARG_DECL);
+
+  /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
+  PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
+
+  void set_obj_ref_factory (
+    PortableInterceptor::ObjectReferenceFactory *current_factory
+    ACE_ENV_ARG_DECL);
+
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles.
   void save_ior_component (const IOP::TaggedComponent &component
@@ -396,9 +406,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
-  // Methods added by the
-  /// @name MIOP specification methods
-  //@{
+  // Methods added by the MIOP specification.
+
   virtual PortableServer::ObjectId * create_id_for_reference (
       CORBA::Object_ptr the_ref
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -437,23 +446,26 @@ public:
       CORBA::SystemException,
       PortableServer::NotAGroupObject
     ));
-  //@}
+
+  // End methods added by MIOP.
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+
   /// Accessor for POA policies.
   TAO_POA_Policy_Set &policies (void);
 
   /// Accessor for cached POA policies.
   TAO_POA_Cached_Policies &cached_policies (void);
 
-  /// This method gives the policies that are exposed to the client.
-  /// These policies are shipped within the IOR.
   virtual CORBA::PolicyList *client_exposed_policies (
       CORBA::Short object_priority
       ACE_ENV_ARG_DECL
     );
+  // This method gives the policies that are exposed to the client.
+  // These policies are shipped within the IOR.
+
 
-  /// Utility functions for the other
+  // Utility functions for the other
   static char* ObjectId_to_string (const PortableServer::ObjectId &id);
 
   static CORBA::WChar* ObjectId_to_wstring (
@@ -507,9 +519,9 @@ public:
 
   CORBA::Boolean cleanup_in_progress (void);
 
-  /// Calls protected static method used when POACurrent is not appropriate.
   static int parse_ir_object_key (const TAO::ObjectKey &object_key,
                                   PortableServer::ObjectId &user_id);
+  // Calls protected static method used when POACurrent is not appropriate.
 
   TAO_Object_Adapter &object_adapter (void);
 
@@ -546,12 +558,6 @@ public:
 
   CORBA::Boolean waiting_destruction (void) const;
 
-  static void ort_adapter_factory_name (const char *name);
-
-  static const char *ort_adapter_factory_name (void);
-
-  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
-
 protected:
 
   /// Template method for creating new POA's of this type.
@@ -608,9 +614,10 @@ protected:
   /// Method to notify the IOR Interceptors when there is a state
   /// changed not related to POAManager.
   void adapter_state_changed (
-      const TAO::ORT_Array &array_obj_ref_template,
+      const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
@@ -652,32 +659,35 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
+//
+// ImplRepo related.
+//
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  /// @name Implementation repository related methods
-  //@{
 
-  /// ImplRepo helper method, notify the ImplRepo on startup
   void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL);
+  // ImplRepo helper method, notify the ImplRepo on startup
 
-  /// ImplRepo helper method, notify the ImplRepo on shutdown
   void imr_notify_shutdown (void);
-  //@}
+  // ImplRepo helper method, notify the ImplRepo on shutdown
+
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  /// Wrapper for the ORB's key_to_object that will alter the object pointer
-  /// if the ImplRepo is used.
+  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
+
   CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    TAO_ServantBase *servant,
                                    CORBA::Boolean collocated,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
+  // Wrapper for the ORB's key_to_object that will alter the object pointer
+  // if the ImplRepo is used.
 
-  /// Like key_to_stub() but assume that the ORB is not shutting down.
   virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
                                    ACE_ENV_ARG_DECL);
+  // Like key_to_stub() but assume that the ORB is not shutting down.
 
   TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
@@ -850,24 +860,6 @@ protected:
   static TAO_POA_Policy_Set &default_poa_policies (void);
 
 protected:
-  /// Accessor methods to ObjectReferenceTemplate
-  PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Accessor methods to ObjectReferenceTemplate, non locked version
-  PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void);
-
-  /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  PortableInterceptor::ObjectReferenceFactory *
-    get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Set the object reference factory
-  void set_obj_ref_factory (
-    PortableInterceptor::ObjectReferenceFactory *current_factory
-    ACE_ENV_ARG_DECL);
-
 
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant &servant
@@ -882,23 +874,6 @@ protected:
       ACE_ENV_ARG_DECL
     );
 
-  CORBA::Object_ptr
-  invoke_key_to_object_helper_i (const char * repository_id,
-                                 const PortableServer::ObjectId & id
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one and hold the POA lock
-  TAO::ORT_Adapter *ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one but assumes the POA lock is already hole
-  TAO::ORT_Adapter *ORT_adapter_i (void);
-
-  TAO::ORT_Adapter_Factory *ORT_adapter_factory (void);
-
   const TAO_Creation_Time &creation_time (void);
 
   CORBA::Boolean persistent (void);
@@ -961,8 +936,13 @@ protected:
 
   CORBA::OctetSeq id_;
 
-  /// Pointer to the object reference template adapter.
-  TAO::ORT_Adapter *ort_adapter_;
+  /// Keep a copy of the pointer to the actual implementation around
+  /// so that we can call some TAO-specific methods on it.
+  TAO_ObjectReferenceTemplate * def_ort_template_;
+
+  PortableInterceptor::ObjectReferenceTemplate_var ort_template_;
+
+  PortableInterceptor::ObjectReferenceFactory_var obj_ref_factory_;
 
   /// Adapter can be accepting, rejecting etc.
   PortableInterceptor::AdapterState adapter_state_;
@@ -1010,7 +990,7 @@ protected:
 
   TAO_ORB_Core &orb_core_;
 
-  /// The object adapter we belong to
+  // The object adapter we belong to
   TAO_Object_Adapter *object_adapter_;
 
   CORBA::Boolean cleanup_in_progress_;
@@ -1094,56 +1074,6 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-/**
- * @class TAO_POA_Static_Resources
- *
- * @brief The static (global) resoures of all POA's.
- *
- * This class is used by the POA to store the resources global to
- * all POA's.  All instance variables that would have been
- * declared "static" in TAO_POA, should be declared in this class
- * to avoid the "static initialization order fiasco" as described in
- * http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.11.
- * Briefly, this is the problem that occurs if any static initializers
- * in any other code call into set static members of TAO_POA.
- * Since the order in which these initializers execute is unspecified,
- * uninitialized members can be accessed.
- */
-class TAO_PortableServer_Export TAO_POA_Static_Resources
-{
-public:
-
-  /// Return the singleton instance.
-  static TAO_POA_Static_Resources* instance (void);
-
-public:
-
-  /**
-   * Name of the factory object used to adapt function calls on the
-   * PortableInterceptor interfaces ORT. The default value is
-   * "ObjectReferenceTemplate_Adapter_Factory". If the ORT library is linked,
-   * the corresponding accessor function
-   * objectreferencefactory_adapter_factory_name() will be called to set
-   * the value to "Concrete_ObjectReferenceTemplate_Adapter_Factory".
-   */
-  ACE_CString ort_adapter_factory_name_;
-
-private:
-  /// Constructor.
-  TAO_POA_Static_Resources (void);
-
-private:
-  /// The singleton instance.
-  static TAO_POA_Static_Resources* instance_;
-
-  /// Mostly unused variable whose sole purpose is to enforce
-  /// the instantiation of a TAO_POA_Static_Resources instance
-  /// at initialization time.
-  static TAO_POA_Static_Resources* initialization_reference_;
-};
-
-// ****************************************************************
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i
index 9821fa6efb4..761d5d67c13 100644
--- a/TAO/tao/PortableServer/POA.i
+++ b/TAO/tao/PortableServer/POA.i
@@ -464,38 +464,15 @@ TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_adapter_template();
-    }
-
-  return 0;
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_POA::get_adapter_template_i ()
+TAO_POA::get_adapter_template ()
 {
-  if (this->ORT_adapter_i ())
-    {
-      return this->ort_adapter_->get_adapter_template ();
-    }
-
-  return 0;
+  return this->ort_template_;
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
-TAO_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_POA::get_obj_ref_factory ()
 {
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_obj_ref_factory();
-    }
-
-  return 0;
+  return this->obj_ref_factory_;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 3c484a85c23..66a9c9eba95 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -3,9 +3,11 @@
 #include "POAManager.h"
 #include "POA.h"
 #include "poa_macros.h"
+#include "tao/IORInterceptor/IORInterceptorC.h"
 #include "tao/Server_Strategy_Factory.h"
+#include "tao/Interceptor_List.h"
 #include "tao/ORB_Core.h"
-#include "tao/IORInterceptor_Adapter.h"
+#include "tao/IORInterceptor/IORInterceptor_List.h"
 
 #if !defined (__ACE_INLINE__)
 # include "POAManager.i"
@@ -138,14 +140,29 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
 {
   PortableInterceptor::AdapterState adapter_state = state;
 
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->object_adapter_.orb_core ().ior_interceptor_adapter ();
+  /// Whenever the POAManager state is changed, the
+  /// adapter_manager_state_changed method is to be invoked on all the IOR
+  ///  Interceptors.
+  TAO_IORInterceptor_List *interceptor_list =
+    this->object_adapter_.orb_core ().ior_interceptor_list ();
 
-  if (ior_adapter)
+  if (interceptor_list == 0)
+    return;
+
+  TAO_IORInterceptor_List::TYPE &interceptors =
+    interceptor_list->interceptors ();
+
+  const size_t interceptor_count = interceptors.size ();
+
+  if (interceptor_count == 0)
+    return;
+
+  for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ior_adapter->adapter_manager_state_changed (TAO_POA_Manager::poa_manager_id_,
-                                                  adapter_state
-                                                  ACE_ENV_ARG_PARAMETER);
+      interceptors[i]->adapter_manager_state_changed (
+        TAO_POA_Manager::poa_manager_id_,
+        adapter_state
+        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 93db1c0d551..c0e8019d9a3 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -29,6 +29,7 @@
 #include "tao/LocalObject.h"
 
 #include "tao/PortableInterceptorC.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 #include "ace/Unbounded_Set.h"
 
 // Forward decl.
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index d60d3dd08f7..b97eddf2681 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -3,8 +3,6 @@
 // $Id$
 
 #include "tao/Environment.h"
-#include "tao/SystemException.h"
-
 
 ACE_INLINE ACE_Lock &
 TAO_POA_Manager::lock (void)
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 485a2f16eaa..69813eb8593 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_codegen.cpp:631
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
@@ -64,7 +64,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyS.inl"
+#include "PolicyS.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -76,7 +76,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_PortableServer_Export Arg_Traits<CORBA::Policy>
     : public
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 712882698eb..8eca9c7ef37 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -59,126 +59,126 @@
 
 namespace POA_CORBA
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:90
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   class _TAO_Policy_ThruPOA_Proxy_Impl;
   class _TAO_Policy_Direct_Proxy_Impl;
   class _TAO_Policy_Strategized_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Policy
     : public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::CORBA::Policy _stub_type;
     typedef ::CORBA::Policy_ptr _stub_ptr_type;
     typedef ::CORBA::Policy_var _stub_var_type;
-
+    
     Policy (const Policy& rhs);
     virtual ~Policy (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::CORBA::Policy *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void _get_policy_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void copy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -186,29 +186,29 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -221,33 +221,33 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_Policy_Strategized_Proxy_Broker *
     the_TAO_Policy_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Policy_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     _get_policy_type (
         TAO_Abstract_ServantBase *servant,
@@ -258,10 +258,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     copy (
         TAO_Abstract_ServantBase *servant,
@@ -272,10 +272,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -287,28 +287,28 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-  // TAO_IDL - Generated from
+  
+  // TAO_IDL - Generated from 
   // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-
+  
 class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
   {
   public:
     _TAO_Policy_Direct_Proxy_Impl (void);
-
+    
     virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     _get_policy_type (
         TAO_Abstract_ServantBase *servant,
@@ -319,10 +319,10 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     copy (
         TAO_Abstract_ServantBase *servant,
@@ -333,10 +333,10 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -348,25 +348,25 @@ class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
         CORBA::SystemException
       ));
   };
-
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_codegen.cpp:1014
 
 #include "PolicyS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "PolicyS.inl"
+#include "PolicyS.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/PortableServer/PolicyS.i b/TAO/tao/PortableServer/PolicyS.i
new file mode 100644
index 00000000000..1d2df31bd57
--- /dev/null
+++ b/TAO/tao/PortableServer/PolicyS.i
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 1bc94beb745..4630c6cffcb 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:720
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
@@ -34,7 +34,7 @@
 #include "PolicyS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
+#include "PolicyS_T.i"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index dceb6d07e98..0228d829356 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -41,16 +41,16 @@
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_sh.cpp:87
-
+  
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  Policy_tie : public Policy
@@ -70,7 +70,7 @@ namespace POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~Policy_tie (void);
     // dtor
-
+    
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -82,47 +82,47 @@ namespace POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-
+    
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     // TAO_IDL - Generated from
     // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    
     CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    
     ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
-
+    
     void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+  
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-
+    
     // copy and assignment are not allowed
     Policy_tie (const Policy_tie &);
     void operator= (const Policy_tie &);
@@ -130,11 +130,11 @@ namespace POA_CORBA
 } // module CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1193
 
 #if defined (__ACE_INLINE__)
-#include "PolicyS_T.inl"
+#include "PolicyS_T.i"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
new file mode 100644
index 00000000000..0305db45663
--- /dev/null
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -0,0 +1,173 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
+// TAO_IDL - Generated from
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/tie_si.cpp:96
+
+#if defined (ACE_HAS_USING_KEYWORD)
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T &t)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (0)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa)
+	: ptr_ (&t),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (0)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_nil ()),
+	  rel_ (release)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+	: ptr_ (tp),
+	  poa_ (PortableServer::POA::_duplicate (poa)),
+	  rel_ (release)
+{}
+
+template <class T> ACE_INLINE
+POA_CORBA::Policy_tie<T>::~Policy_tie (void)
+{
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+}
+
+template <class T> ACE_INLINE T *
+POA_CORBA::Policy_tie<T>::_tied_object (void)
+{
+  return this->ptr_;
+}
+
+template <class T> ACE_INLINE void
+POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
+{
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
+  this->ptr_ = &obj;
+  this->rel_ = 0;
+}
+
+template <class T> ACE_INLINE void
+POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+{
+  if (this->rel_)
+    {
+      delete this->ptr_;
+    }
+  
+  this->ptr_ = obj;
+  this->rel_ = release;
+}
+
+template <class T> ACE_INLINE CORBA::Boolean
+POA_CORBA::Policy_tie<T>::_is_owner (void)
+{
+  return this->rel_;
+}
+
+template <class T> ACE_INLINE void
+POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b)
+{
+  this->rel_ = b;
+}
+
+template <class T> ACE_INLINE PortableServer::POA_ptr
+POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (!CORBA::is_nil (this->poa_.in ()))
+    {
+      return PortableServer::POA::_duplicate (this->poa_.in ());
+    }
+  
+  return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+// TAO_IDL - Generated from 
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
+template <class T> ACE_INLINE
+CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->ptr_->policy_type (
+    ACE_ENV_SINGLE_ARG_PARAMETER
+  );
+}
+
+// TAO_IDL - Generated from 
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
+template <class T> ACE_INLINE
+::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  return this->ptr_->copy (
+    ACE_ENV_SINGLE_ARG_PARAMETER
+  );
+}
+
+// TAO_IDL - Generated from 
+// C:\ACE\BCB6dd\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
+
+template <class T> ACE_INLINE
+void POA_CORBA::Policy_tie<T>::destroy  (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  this->ptr_->destroy (
+    ACE_ENV_SINGLE_ARG_PARAMETER
+  );
+}
+
+#endif /* ACE_HAS_USING_KEYWORD */
+
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 55a2d2d6c2e..ece8be6870c 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -54,7 +54,7 @@ module PortableServer
 {
 # pragma version PortableServer 2.3
 
-  local interface POA;      // forward declaration
+  local interface POA;	    // forward declaration
   typedef sequence<POA> POAList;
   native Servant;
   typedef CORBA::OctetSeq ObjectId;
@@ -255,7 +255,7 @@ module PortableServer
                     in POAManager a_POAManager,
                     in CORBA::PolicyList policies)
       raises (AdapterAlreadyExists,
-              InvalidPolicy);
+	      InvalidPolicy);
 
     POA find_POA (in string adapter_name,
                   in boolean activate_it)
@@ -269,7 +269,7 @@ module PortableServer
     ThreadPolicy create_thread_policy (in ThreadPolicyValue value);
 
     LifespanPolicy create_lifespan_policy (
-        in LifespanPolicyValue value
+	in LifespanPolicyValue value
       );
 
     IdUniquenessPolicy  create_id_uniqueness_policy (
@@ -281,7 +281,7 @@ module PortableServer
       );
 
     ImplicitActivationPolicy create_implicit_activation_policy (
-        in ImplicitActivationPolicyValue value
+        in ImplicitActivationPolicyValue value\
       );
 
     ServantRetentionPolicy create_servant_retention_policy (
@@ -289,7 +289,7 @@ module PortableServer
       );
 
     RequestProcessingPolicy create_request_processing_policy (
-        in RequestProcessingPolicyValue value
+	in RequestProcessingPolicyValue value
       );
 
     // POA attributes
@@ -311,7 +311,7 @@ module PortableServer
 
     Servant get_servant ()
       raises (NoServant,
-              WrongPolicy);
+	      WrongPolicy);
 
     void set_servant (in Servant p_servant)
       raises (WrongPolicy);
@@ -320,13 +320,13 @@ module PortableServer
 
     ObjectId  activate_object (in Servant p_servant)
       raises (ServantAlreadyActive,
-              WrongPolicy);
+	      WrongPolicy);
 
     void activate_object_with_id (in ObjectId id,
                                   in Servant p_servant)
       raises (ServantAlreadyActive,
-              ObjectAlreadyActive,
-              WrongPolicy);
+	      ObjectAlreadyActive,
+	      WrongPolicy);
 
     void deactivate_object (in ObjectId oid)
       raises (ObjectNotActive, WrongPolicy);
@@ -337,32 +337,32 @@ module PortableServer
       raises (WrongPolicy);
 
     Object create_reference_with_id (in ObjectId oid,
-                                     in CORBA::RepositoryId intf)
+				     in CORBA::RepositoryId intf)
       raises (WrongPolicy);
 
     // Identity mapping operations:.
     ObjectId servant_to_id (in Servant p_servant)
       raises (ServantNotActive,
-              WrongPolicy);
+	      WrongPolicy);
 
     Object servant_to_reference (in Servant p_servant)
       raises (ServantNotActive, WrongPolicy);
 
     Servant reference_to_servant (in Object reference)
       raises (ObjectNotActive,
-              WrongAdapter,
-              WrongPolicy);
+	      WrongAdapter,
+	      WrongPolicy);
 
     ObjectId reference_to_id (in Object reference)
       raises (WrongAdapter,
-              WrongPolicy);
+	      WrongPolicy);
 
     Servant id_to_servant (in ObjectId oid)
       raises (ObjectNotActive, WrongPolicy);
 
     Object id_to_reference (in ObjectId oid)
       raises (ObjectNotActive,
-              WrongPolicy);
+	      WrongPolicy);
 
     readonly attribute CORBA::OctetSeq id;
 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index f9e777c153b..d4d2f055929 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -42,7 +42,7 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "PortableServerC.inl"
+#include "PortableServerC.i"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
@@ -466,7 +466,7 @@ void PortableServer::IDs::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_duplicate (
     PortableServer::ThreadPolicy_ptr p
   )
 {
@@ -475,7 +475,7 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_release (
     PortableServer::ThreadPolicy_ptr p
   )
 {
@@ -484,14 +484,14 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_nil (void)
 {
   return PortableServer::ThreadPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_marshal (
     PortableServer::ThreadPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -617,7 +617,7 @@ PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_duplicate (
     PortableServer::LifespanPolicy_ptr p
   )
 {
@@ -626,7 +626,7 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_release (
     PortableServer::LifespanPolicy_ptr p
   )
 {
@@ -635,14 +635,14 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_nil (void)
 {
   return PortableServer::LifespanPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_marshal (
     PortableServer::LifespanPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -766,7 +766,7 @@ PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_duplicate (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
@@ -775,7 +775,7 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_release (
     PortableServer::IdUniquenessPolicy_ptr p
   )
 {
@@ -784,14 +784,14 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_nil (void)
 {
   return PortableServer::IdUniquenessPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_marshal (
     PortableServer::IdUniquenessPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -915,7 +915,7 @@ PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_duplicate (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
@@ -924,7 +924,7 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_release (
     PortableServer::IdAssignmentPolicy_ptr p
   )
 {
@@ -933,14 +933,14 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_nil (void)
 {
   return PortableServer::IdAssignmentPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_marshal (
     PortableServer::IdAssignmentPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1066,7 +1066,7 @@ PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_duplicate (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
@@ -1075,7 +1075,7 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_release (
     PortableServer::ImplicitActivationPolicy_ptr p
   )
 {
@@ -1084,14 +1084,14 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_nil (void)
 {
   return PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_marshal (
     PortableServer::ImplicitActivationPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1219,7 +1219,7 @@ PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_duplicate (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
@@ -1228,7 +1228,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_release (
     PortableServer::ServantRetentionPolicy_ptr p
   )
 {
@@ -1237,14 +1237,14 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_nil (void)
 {
   return PortableServer::ServantRetentionPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_marshal (
     PortableServer::ServantRetentionPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1372,7 +1372,7 @@ PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_duplicate (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
@@ -1381,7 +1381,7 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_release (
     PortableServer::RequestProcessingPolicy_ptr p
   )
 {
@@ -1390,14 +1390,14 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void)
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_nil (void)
 {
   return PortableServer::RequestProcessingPolicy::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal (
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_marshal (
     PortableServer::RequestProcessingPolicy_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1523,7 +1523,7 @@ PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
+TAO::Objref_Traits<PortableServer::POAManager>::tao_duplicate (
     PortableServer::POAManager_ptr p
   )
 {
@@ -1532,7 +1532,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::POAManager>::release (
+TAO::Objref_Traits<PortableServer::POAManager>::tao_release (
     PortableServer::POAManager_ptr p
   )
 {
@@ -1541,14 +1541,14 @@ TAO::Objref_Traits<PortableServer::POAManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::nil (void)
+TAO::Objref_Traits<PortableServer::POAManager>::tao_nil (void)
 {
   return PortableServer::POAManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POAManager>::marshal (
+TAO::Objref_Traits<PortableServer::POAManager>::tao_marshal (
     PortableServer::POAManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1771,7 +1771,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_duplicate (
     PortableServer::AdapterActivator_ptr p
   )
 {
@@ -1780,7 +1780,7 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_release (
     PortableServer::AdapterActivator_ptr p
   )
 {
@@ -1789,14 +1789,14 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void)
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_nil (void)
 {
   return PortableServer::AdapterActivator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal (
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_marshal (
     PortableServer::AdapterActivator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -1916,7 +1916,7 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_duplicate (
     PortableServer::ServantManager_ptr p
   )
 {
@@ -1925,7 +1925,7 @@ TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantManager>::release (
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_release (
     PortableServer::ServantManager_ptr p
   )
 {
@@ -1934,14 +1934,14 @@ TAO::Objref_Traits<PortableServer::ServantManager>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_nil (void)
 {
   return PortableServer::ServantManager::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantManager>::marshal (
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_marshal (
     PortableServer::ServantManager_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2061,7 +2061,7 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_duplicate (
     PortableServer::ServantActivator_ptr p
   )
 {
@@ -2070,7 +2070,7 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantActivator>::release (
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_release (
     PortableServer::ServantActivator_ptr p
   )
 {
@@ -2079,14 +2079,14 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_nil (void)
 {
   return PortableServer::ServantActivator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantActivator>::marshal (
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_marshal (
     PortableServer::ServantActivator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2210,7 +2210,7 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_duplicate (
     PortableServer::ServantLocator_ptr p
   )
 {
@@ -2219,7 +2219,7 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::ServantLocator>::release (
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_release (
     PortableServer::ServantLocator_ptr p
   )
 {
@@ -2228,14 +2228,14 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void)
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_nil (void)
 {
   return PortableServer::ServantLocator::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantLocator>::marshal (
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_marshal (
     PortableServer::ServantLocator_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -2361,7 +2361,7 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POA_ptr
-TAO::Objref_Traits<PortableServer::POA>::duplicate (
+TAO::Objref_Traits<PortableServer::POA>::tao_duplicate (
     PortableServer::POA_ptr p
   )
 {
@@ -2370,7 +2370,7 @@ TAO::Objref_Traits<PortableServer::POA>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::POA>::release (
+TAO::Objref_Traits<PortableServer::POA>::tao_release (
     PortableServer::POA_ptr p
   )
 {
@@ -2379,14 +2379,14 @@ TAO::Objref_Traits<PortableServer::POA>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::POA_ptr
-TAO::Objref_Traits<PortableServer::POA>::nil (void)
+TAO::Objref_Traits<PortableServer::POA>::tao_nil (void)
 {
   return PortableServer::POA::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POA>::marshal (
+TAO::Objref_Traits<PortableServer::POA>::tao_marshal (
     PortableServer::POA_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -3538,7 +3538,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &)
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::duplicate (
+TAO::Objref_Traits<PortableServer::Current>::tao_duplicate (
     PortableServer::Current_ptr p
   )
 {
@@ -3547,7 +3547,7 @@ TAO::Objref_Traits<PortableServer::Current>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<PortableServer::Current>::release (
+TAO::Objref_Traits<PortableServer::Current>::tao_release (
     PortableServer::Current_ptr p
   )
 {
@@ -3556,14 +3556,14 @@ TAO::Objref_Traits<PortableServer::Current>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::nil (void)
+TAO::Objref_Traits<PortableServer::Current>::tao_nil (void)
 {
   return PortableServer::Current::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<PortableServer::Current>::marshal (
+TAO::Objref_Traits<PortableServer::Current>::tao_marshal (
     PortableServer::Current_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -4767,3 +4767,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 4d3f66bc31b..f0e092c8013 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -3206,14 +3206,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::POA>
   {
-    static PortableServer::POA_ptr duplicate (
+    static PortableServer::POA_ptr tao_duplicate (
         PortableServer::POA_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::POA_ptr
       );
-    static PortableServer::POA_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::POA_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::POA_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3229,14 +3229,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ThreadPolicy>
   {
-    static PortableServer::ThreadPolicy_ptr duplicate (
+    static PortableServer::ThreadPolicy_ptr tao_duplicate (
         PortableServer::ThreadPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ThreadPolicy_ptr
       );
-    static PortableServer::ThreadPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ThreadPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ThreadPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3252,14 +3252,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::LifespanPolicy>
   {
-    static PortableServer::LifespanPolicy_ptr duplicate (
+    static PortableServer::LifespanPolicy_ptr tao_duplicate (
         PortableServer::LifespanPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::LifespanPolicy_ptr
       );
-    static PortableServer::LifespanPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::LifespanPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::LifespanPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3273,14 +3273,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdUniquenessPolicy>
   {
-    static PortableServer::IdUniquenessPolicy_ptr duplicate (
+    static PortableServer::IdUniquenessPolicy_ptr tao_duplicate (
         PortableServer::IdUniquenessPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::IdUniquenessPolicy_ptr
       );
-    static PortableServer::IdUniquenessPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::IdUniquenessPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::IdUniquenessPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3294,14 +3294,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdAssignmentPolicy>
   {
-    static PortableServer::IdAssignmentPolicy_ptr duplicate (
+    static PortableServer::IdAssignmentPolicy_ptr tao_duplicate (
         PortableServer::IdAssignmentPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::IdAssignmentPolicy_ptr
       );
-    static PortableServer::IdAssignmentPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::IdAssignmentPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::IdAssignmentPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3317,14 +3317,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ImplicitActivationPolicy>
   {
-    static PortableServer::ImplicitActivationPolicy_ptr duplicate (
+    static PortableServer::ImplicitActivationPolicy_ptr tao_duplicate (
         PortableServer::ImplicitActivationPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ImplicitActivationPolicy_ptr
       );
-    static PortableServer::ImplicitActivationPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ImplicitActivationPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ImplicitActivationPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3338,14 +3338,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantRetentionPolicy>
   {
-    static PortableServer::ServantRetentionPolicy_ptr duplicate (
+    static PortableServer::ServantRetentionPolicy_ptr tao_duplicate (
         PortableServer::ServantRetentionPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantRetentionPolicy_ptr
       );
-    static PortableServer::ServantRetentionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantRetentionPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantRetentionPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3359,14 +3359,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::RequestProcessingPolicy>
   {
-    static PortableServer::RequestProcessingPolicy_ptr duplicate (
+    static PortableServer::RequestProcessingPolicy_ptr tao_duplicate (
         PortableServer::RequestProcessingPolicy_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::RequestProcessingPolicy_ptr
       );
-    static PortableServer::RequestProcessingPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::RequestProcessingPolicy_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::RequestProcessingPolicy_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3382,14 +3382,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::POAManager>
   {
-    static PortableServer::POAManager_ptr duplicate (
+    static PortableServer::POAManager_ptr tao_duplicate (
         PortableServer::POAManager_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::POAManager_ptr
       );
-    static PortableServer::POAManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::POAManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::POAManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3405,14 +3405,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::AdapterActivator>
   {
-    static PortableServer::AdapterActivator_ptr duplicate (
+    static PortableServer::AdapterActivator_ptr tao_duplicate (
         PortableServer::AdapterActivator_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::AdapterActivator_ptr
       );
-    static PortableServer::AdapterActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::AdapterActivator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::AdapterActivator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3426,14 +3426,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantManager>
   {
-    static PortableServer::ServantManager_ptr duplicate (
+    static PortableServer::ServantManager_ptr tao_duplicate (
         PortableServer::ServantManager_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantManager_ptr
       );
-    static PortableServer::ServantManager_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantManager_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3447,14 +3447,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantActivator>
   {
-    static PortableServer::ServantActivator_ptr duplicate (
+    static PortableServer::ServantActivator_ptr tao_duplicate (
         PortableServer::ServantActivator_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantActivator_ptr
       );
-    static PortableServer::ServantActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantActivator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantActivator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3468,14 +3468,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantLocator>
   {
-    static PortableServer::ServantLocator_ptr duplicate (
+    static PortableServer::ServantLocator_ptr tao_duplicate (
         PortableServer::ServantLocator_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::ServantLocator_ptr
       );
-    static PortableServer::ServantLocator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::ServantLocator_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::ServantLocator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3491,14 +3491,14 @@ namespace TAO
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_PortableServer_Export Objref_Traits<PortableServer::Current>
   {
-    static PortableServer::Current_ptr duplicate (
+    static PortableServer::Current_ptr tao_duplicate (
         PortableServer::Current_ptr
       );
-    static void release (
+    static void tao_release (
         PortableServer::Current_ptr
       );
-    static PortableServer::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static PortableServer::Current_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
         PortableServer::Current_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -3892,7 +3892,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 // be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
-#include "PortableServerC.inl"
+#include "PortableServerC.i"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
@@ -3906,3 +3906,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
new file mode 100644
index 00000000000..38aa32569ba
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 4e6f1ed2dd0..ff320d9ee3c 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -152,8 +152,8 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Stub *stub = 0;
 
   TAO_POA_Current_Impl *poa_current_impl =
-    static_cast<TAO_POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+    ACE_static_cast(TAO_POA_Current_Impl *,
+                    TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   CORBA::ORB_ptr servant_orb = 0;
 
@@ -162,6 +162,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
     {
       servant_orb = poa_current_impl->orb_core ().orb () ;
 
+
       stub =
         poa_current_impl->poa ()->key_to_stub (
             poa_current_impl->object_key (),
@@ -215,7 +216,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
 
   // Fetch the skeleton for this operation
   if (this->_find (opname, skel,
-         static_cast <unsigned int> (req.operation_length())) == -1)
+         ACE_static_cast (unsigned int, req.operation_length())) == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
@@ -281,7 +282,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
 
   // Fetch the skeleton for this operation
   if (this->_find (opname, skel,
-         static_cast <unsigned int> (req.operation_length())) == -1)
+         ACE_static_cast (unsigned int, req.operation_length())) == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION ());
     }
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 9ca8fb1a055..be7712f6f00 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -56,14 +56,14 @@ TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   // 64-bit platforms.
 
   if (sizeof (this) == 4)       // 32 bit address
-    id = static_cast <CORBA::ULong> (
-                     reinterpret_cast <ptrdiff_t>
-                                      (&(this->server_request_)));
+    id = ACE_static_cast (CORBA::ULong,
+                          ACE_reinterpret_cast (ptrdiff_t,
+                                                &(this->server_request_)));
 
   else if (sizeof (this) == 8)  // 64 bit address -- use lower 32 bits
-    id = static_cast <CORBA::ULong> (
-                     reinterpret_cast <ptrdiff_t>
-                               (&(this->server_request_)) & 0xFFFFFFFFu);
+    id = ACE_static_cast (CORBA::ULong,
+                          ACE_reinterpret_cast (ptrdiff_t,
+                               &(this->server_request_)) & 0xFFFFFFFFu);
 
   else
     // @@ Rather than fallback on the GIOP request ID, we should use
diff --git a/TAO/tao/PortableServer/diffs/Default_ORT.diff b/TAO/tao/PortableServer/diffs/Default_ORT.diff
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/Default_ORT.diff