diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 60 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepo.pidl | 30 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoC.cpp | 5483 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoC.h | 1468 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoC.i | 444 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS.cpp | 4016 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS.h | 2237 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS.i | 23 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS_T.cpp | 26 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS_T.h | 30 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS_T.i | 62 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoC.cpp.diff | 5019 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoC.h.diff | 1796 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoC.i.diff | 814 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS.cpp.diff | 2457 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS.h.diff | 1681 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS.i.diff | 0 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS_T.cpp.diff | 0 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS_T.h.diff | 0 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS_T.i.diff | 131 |
20 files changed, 22580 insertions, 3197 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c058ba66a6e..3ff1193eebb 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,22 +1,48 @@ +Sun Apr 1 17:44:30 2001 Carlos O'Ryan <coryan@uci.edu> + + * tao/PortableServer/ImplRepo.pidl: + Include documentation on how to regenerate the file. + + * tao/PortableServer/ImplRepoC.h: + * tao/PortableServer/ImplRepoC.i: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/ImplRepoS.h: + * tao/PortableServer/ImplRepoS.i: + * tao/PortableServer/ImplRepoS.cpp: + * tao/PortableServer/ImplRepoS_T.h: + * tao/PortableServer/ImplRepoS_T.i: + * tao/PortableServer/ImplRepoS_T.cpp: + * tao/diffs/ImplRepoC.h.diff: + * tao/diffs/ImplRepoC.i.diff: + * tao/diffs/ImplRepoC.cpp.diff: + * tao/diffs/ImplRepoS.h.diff: + * tao/diffs/ImplRepoS.i.diff: + * tao/diffs/ImplRepoS.cpp.diff: + * tao/diffs/ImplRepoS_T.h.diff: + * tao/diffs/ImplRepoS_T.i.diff: + * tao/diffs/ImplRepoS_T.cpp.diff: + Regenerated the files, also created the (mostly empty) diff + files. + Sun Apr 1 18:47:32 2001 Krishnakumar B <kitty@cs.wustl.edu> - *examples/Logging/Logging_Service.cpp - *examples/Logging/Logging_Test_i.cpp - *examples/Load_Balancing_persistent/Identity_i.cpp - *examples/Load_Balancing/Identity_i.cpp - *examples/Load_Balancing/Load_Balancer_i.cpp - *examples/Simulator/Event_Supplier/DualEC_Sup.cpp - *examples/Simulator/Event_Supplier/Event_Con.cpp - *examples/Simple/grid/Grid_Client_i.cpp - *examples/Simple/grid/Grid_i.cpp - *examples/Simple/chat/server.cpp - *examples/Simple/chat/Server_i.cpp - *examples/Simple/bank/Bank_Client_i.cpp - *examples/Persistent_Grid/Grid_Client_i.cpp - *examples/Persistent_Grid/Persistent_Client_i.cpp - *examples/Persistent_Grid/Simple_util.cpp - - Fix ACE_TRY_ENV Fuzz script errors. + *examples/Logging/Logging_Service.cpp + *examples/Logging/Logging_Test_i.cpp + *examples/Load_Balancing_persistent/Identity_i.cpp + *examples/Load_Balancing/Identity_i.cpp + *examples/Load_Balancing/Load_Balancer_i.cpp + *examples/Simulator/Event_Supplier/DualEC_Sup.cpp + *examples/Simulator/Event_Supplier/Event_Con.cpp + *examples/Simple/grid/Grid_Client_i.cpp + *examples/Simple/grid/Grid_i.cpp + *examples/Simple/chat/server.cpp + *examples/Simple/chat/Server_i.cpp + *examples/Simple/bank/Bank_Client_i.cpp + *examples/Persistent_Grid/Grid_Client_i.cpp + *examples/Persistent_Grid/Persistent_Client_i.cpp + *examples/Persistent_Grid/Simple_util.cpp + + Fix ACE_TRY_ENV Fuzz script errors. Sun Apr 1 16:06:15 2001 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl index f29dd03c836..550284a7051 100644 --- a/TAO/tao/PortableServer/ImplRepo.pidl +++ b/TAO/tao/PortableServer/ImplRepo.pidl @@ -1,4 +1,32 @@ -// $Id$ +// -*- IDL -*- + +//============================================================================= +/** + * @file ImplRepo.pidl + * + * $Id$ + * + * This file was used to generate the code in ImplRepo{C,S,S_T}.{h,i,cpp} + * + * The command used to generate code from this file is: + * + * tao_idl.exe + * -o orig -Gp -Gd -Ge 1 + * -Wb,export_macro=TAO_PortableServer_Export + * -Wb,export_include=portableserver_export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * ImplRepo.pidl + * + * after the file is generated a patch must be applied. T he patch + * disables the code under certain configurations, and eliminates + * cycles in the include dependencies. + * Those changes are required because the generated code is part of + * the TAO library, it hardly makes any sense to change the IDL + * compiler to support changes that are very occasional. + * + */ +//============================================================================= module ImplementationRepository { diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 8e9016ffe73..6e44a09ab28 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -1,71 +1,57 @@ -/* -*- C++ -*- $Id$ */ - - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html #include "ImplRepoC.h" + #include "tao/Stub.h" -#include "tao/NVList.h" -#include "tao/ORB_Core.h" #include "tao/Invocation.h" +#include "tao/PortableInterceptor.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus +#endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "ImplRepoC.i" #endif /* !defined INLINE */ -void ImplementationRepository::ServerObject::_tao_any_destructor (void *x) -{ - ImplementationRepository::ServerObject *tmp = ACE_static_cast (ImplementationRepository::ServerObject*,x); - CORBA::release (tmp); -} -ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if (CORBA::is_nil (obj)) - return ServerObject::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (ServerObject::_nil ()); - if (is_a == 0) - return ServerObject::_nil (); - return ServerObject::_unchecked_narrow (obj, ACE_TRY_ENV); -} +/////////////////////////////////////////////////////////////////////// +// Base & Remote Proxy Implementation. +// -ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) -{ - if (CORBA::is_nil (obj)) - return ServerObject::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - ServerObject_ptr default_proxy = ServerObject::_nil (); - if (obj->_is_collocated () && _TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer != 0) - { - default_proxy = _TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer (obj); - } - if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, ServerObject (stub), ServerObject::_nil ()); - return TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); -} +ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void) +{} -ImplementationRepository::ServerObject_ptr -ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} +ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject_Remote_Proxy_Impl (void) +{} -void ImplementationRepository::ServerObject::ping ( +// Remote Implementation of the IDL interface methods + +void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( + CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( @@ -73,10 +59,14 @@ void ImplementationRepository::ServerObject::ping ( )) { - TAO_Stub *istub = this->_stubobj (); + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "ping", @@ -85,32 +75,124 @@ void ImplementationRepository::ServerObject::ping ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); + +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri ( + &_tao_call, + _collocated_tao_target_, + ACE_TRY_ENV + ); + ACE_CHECK; - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + ACE_TRY { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 } - break; - } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -void ImplementationRepository::ServerObject::shutdown ( +void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( + CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( @@ -119,10 +201,13 @@ void ImplementationRepository::ServerObject::shutdown ( { - TAO_Stub *istub = this->_stubobj (); + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown", @@ -131,226 +216,564 @@ void ImplementationRepository::ServerObject::shutdown ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( + &_tao_call, + _collocated_tao_target_, + ACE_TRY_ENV + ); + ACE_CHECK; - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; } - ACE_CHECK; - break; + ACE_ENDTRY; + ACE_CHECK; - } +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) + +// +// End Base & Remote Proxy Implemeentation. +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote & Base Proxy Broker Implementation +// + +ImplementationRepository::_TAO_ServerObject_Proxy_Broker::_TAO_ServerObject_Proxy_Broker (void) { - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); } -const char* ImplementationRepository::ServerObject::_interface_repository_id (void) const +ImplementationRepository::_TAO_ServerObject_Proxy_Broker::~_TAO_ServerObject_Proxy_Broker (void) { - return "IDL:ImplementationRepository/ServerObject:1.0"; } -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory::TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (int register_proxy_factory) +ImplementationRepository::_TAO_ServerObject_Proxy_Broker * (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + +// Factory Member function Implementation. +ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker * +ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::the_TAO_ServerObject_Remote_Proxy_Broker (void) { - if (register_proxy_factory) - { - TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); - } + static ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker remote_proxy_broker; + return &remote_proxy_broker; } -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory::~TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (void) +ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::_TAO_ServerObject_Remote_Proxy_Broker (void) { } -ImplementationRepository::ServerObject_ptr -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory::create_proxy ( - ::ImplementationRepository::ServerObject_ptr proxy, - CORBA::Environment & - ) +ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObject_Remote_Proxy_Broker (void) +{ +} + +ImplementationRepository::_TAO_ServerObject_Proxy_Impl& +ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy ( + ::ImplementationRepository::ServerObject *, + CORBA::Environment & +) { - return proxy; + return this->remote_proxy_impl_; } -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter (void) - : proxy_factory_ (0), - delete_proxy_factory_ (0) + +// +// End Remote & Base Proxy Broker Implementation +/////////////////////////////////////////////////////////////////////// + + +// default constructor +ImplementationRepository::ServerObject::ServerObject (int collocated) { + this->ImplementationRepository_ServerObject_setup_collocation (collocated); } -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter::~TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter (void) +// destructor +ImplementationRepository::ServerObject::~ServerObject (void) +{} + +void +ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_setup_collocation (int collocated) { - // Making sure the factory which the adapter has is destroyed with it. - if (this->proxy_factory_ != 0) - delete this->proxy_factory_; + if (collocated) + this->the_TAO_ServerObject_Proxy_Broker_ = + ::ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer (this); + else + this->the_TAO_ServerObject_Proxy_Broker_ = + ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::the_TAO_ServerObject_Remote_Proxy_Broker (); } -int -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter::register_proxy_factory ( - TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *df, - CORBA::Environment &ACE_TRY_ENV - ) +void ImplementationRepository::ServerObject::_tao_any_destructor (void *x) { - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - // Remove any existing <proxy_factory_> and replace with the new one. - this->unregister_proxy_factory (ACE_TRY_ENV); - this->proxy_factory_ = df; - this->delete_proxy_factory_ = 0; -return 0; + ServerObject *tmp = ACE_static_cast (ServerObject*,x); + CORBA::release (tmp); } -int -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter::unregister_proxy_factory ( - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) - { - // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is - // invoked in the destructor of the class too. - this->delete_proxy_factory_ = 1; - delete this->proxy_factory_; - this->proxy_factory_ = 0; +ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV + ) +{ + if (CORBA::is_nil (obj)) + return ServerObject::_nil (); + if (! obj->_is_local ()) + { + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0", ACE_TRY_ENV); + ACE_CHECK_RETURN (ServerObject::_nil ()); + if (is_a == 0) + return ServerObject::_nil (); } -return 0; + return ServerObject::_unchecked_narrow (obj, ACE_TRY_ENV); } -ImplementationRepository::ServerObject_ptr -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter::create_proxy ( - ::ImplementationRepository::ServerObject_ptr proxy, +ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow ( + CORBA::Object_ptr obj, CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - // Verify that an <proxy_factory_> is available else make one. - if (this->proxy_factory_ == 0) - ACE_NEW_RETURN (this->proxy_factory_, - TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (1), - 0); + if (CORBA::is_nil (obj)) + return ServerObject::_nil (); + if (! obj->_is_local ()) + { + TAO_Stub* stub = obj->_stubobj (); + if (stub) + stub->_incr_refcnt (); + ServerObject_ptr default_proxy = ServerObject::_nil (); + + if ( + !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && + obj->_is_collocated () &&ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer != 0 + ) + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::ServerObject ( + stub, + 1, + obj->_servant ()), + ServerObject::_nil ()); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerObject (stub, 0, obj->_servant ()), ServerObject::_nil ()); + return default_proxy; + } + else + return + ACE_reinterpret_cast + ( + ServerObject_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServerObject::_narrow + ) + ) + ); +} + +ImplementationRepository::ServerObject_ptr +ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} - return this->proxy_factory_->create_proxy (proxy); +CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) +{ + if ( + (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) + return 1; // success using local knowledge + else + return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); } -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base::TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (::ImplementationRepository::ServerObject_ptr proxy) -: base_proxy_ (proxy) +void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type) { + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } -ImplementationRepository::TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base::~TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (void) +const char* ImplementationRepository::ServerObject::_interface_repository_id (void) const { + return "IDL:ImplementationRepository/ServerObject:1.0"; } -void ImplementationRepository::TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base::ping ( +void ImplementationRepository::ServerObject::ping ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->base_proxy_->ping ( + _TAO_ServerObject_Proxy_Impl &proxy = + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.ping ( + this, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base::shutdown ( +void ImplementationRepository::ServerObject::shutdown ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->base_proxy_->shutdown ( + _TAO_ServerObject_Proxy_Impl &proxy = + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.shutdown ( + this, ACE_TRY_ENV ); +} + + +#if (TAO_HAS_INTERCEPTORS == 1) +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target) +{} + +Dynamic::ParameterList * +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return parameter_list; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +Dynamic::ExceptionList * +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} + + +CORBA::Any * +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target) +{} + +Dynamic::ParameterList * +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return parameter_list; +} + +Dynamic::ExceptionList * +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} + + +CORBA::Any * +ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +#endif /* TAO_HAS_INTERCEPTORS */ 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 (0x30000000), // repository ID = IDL:ImplementationRepository/ServerObject:1.0 - 13, ACE_NTOHL (0x53657276), ACE_NTOHL (0x65724f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = ServerObject + 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 (0x30000000), // repository ID = IDL:ImplementationRepository/ServerObject:1.0 + 13, + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x0), // name = ServerObject }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject (CORBA::tk_objref, sizeof (_oc_ImplementationRepository_ServerObject), (char *) &_oc_ImplementationRepository_ServerObject, 0, sizeof (ImplementationRepository::ServerObject)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject ( + CORBA::tk_objref, + sizeof (_oc_ImplementationRepository_ServerObject), + (char *) &_oc_ImplementationRepository_ServerObject, + 0, + sizeof (ImplementationRepository::ServerObject) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerObject, &_tc_TAO_tc_ImplementationRepository_ServerObject) TAO_NAMESPACE_END + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 - 20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 + 20, + 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 (0x0), // name = name + 5, + ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x0), // name = name CORBA::tk_string, 0U, // string length - 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value + 6, + ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x65000000), // name = value CORBA::tk_string, 0U, // string length }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable (CORBA::tk_struct, sizeof (_oc_ImplementationRepository_EnvironmentVariable), (char *) &_oc_ImplementationRepository_EnvironmentVariable, 0, sizeof (ImplementationRepository::EnvironmentVariable)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable ( + CORBA::tk_struct, + sizeof (_oc_ImplementationRepository_EnvironmentVariable), + (char *) &_oc_ImplementationRepository_EnvironmentVariable, + 0, + sizeof (ImplementationRepository::EnvironmentVariable) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnvironmentVariable, &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable) TAO_NAMESPACE_END + void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *x) { - ImplementationRepository::EnvironmentVariable *tmp = ACE_static_cast (ImplementationRepository::EnvironmentVariable*,x); + EnvironmentVariable *tmp = ACE_static_cast (EnvironmentVariable*,x); delete tmp; } 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 - 8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address + 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 + 8, + ACE_NTOHL (0x41646472), + ACE_NTOHL (0x65737300), // name = Address CORBA::tk_string, 0U, // string length }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address (CORBA::tk_alias, sizeof (_oc_ImplementationRepository_Address), (char *) &_oc_ImplementationRepository_Address, 0, sizeof (ImplementationRepository::Address)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address ( + CORBA::tk_alias, + sizeof (_oc_ImplementationRepository_Address), + (char *) &_oc_ImplementationRepository_Address, + 0, + sizeof (ImplementationRepository::Address) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_ImplementationRepository_Address) TAO_NAMESPACE_END + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) @@ -439,7 +862,7 @@ ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor {} void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *x) { - ImplementationRepository::EnvironmentList *tmp = ACE_static_cast (ImplementationRepository::EnvironmentList*,x); + EnvironmentList *tmp = ACE_static_cast (EnvironmentList*,x); delete tmp; } @@ -449,190 +872,528 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *x) 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 - 16, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 + 16, + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 - 20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 + 20, + 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 (0x0), // name = name + 5, + ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x0), // name = name CORBA::tk_string, 0U, // string length - 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value + 6, + ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x65000000), // name = value CORBA::tk_string, 0U, // string length 0U, }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentList (CORBA::tk_alias, sizeof (_oc_ImplementationRepository_EnvironmentList), (char *) &_oc_ImplementationRepository_EnvironmentList, 0, sizeof (ImplementationRepository::EnvironmentList)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentList ( + CORBA::tk_alias, + sizeof (_oc_ImplementationRepository_EnvironmentList), + (char *) &_oc_ImplementationRepository_EnvironmentList, + 0, + sizeof (ImplementationRepository::EnvironmentList) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnvironmentList, &_tc_TAO_tc_ImplementationRepository_EnvironmentList) TAO_NAMESPACE_END + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 - 15, ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 + 15, + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count - 7, ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL - 7, ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL - 11, ACE_NTOHL (0x5045525f), ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT - 11, ACE_NTOHL (0x4155544f), ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START + 7, + ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x414c0000), // name = NORMAL + 7, + ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x414c0000), // name = MANUAL + 11, + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x4e540000), // name = PER_CLIENT + 11, + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x52540000), // name = AUTO_START }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode (CORBA::tk_enum, sizeof (_oc_ImplementationRepository_ActivationMode), (char *) &_oc_ImplementationRepository_ActivationMode, 0, sizeof (ImplementationRepository::ActivationMode)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode ( + CORBA::tk_enum, + sizeof (_oc_ImplementationRepository_ActivationMode), + (char *) &_oc_ImplementationRepository_ActivationMode, + 0, + sizeof (ImplementationRepository::ActivationMode) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ActivationMode, &_tc_TAO_tc_ImplementationRepository_ActivationMode) TAO_NAMESPACE_END + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 - 15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 + 15, + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count - 13, ACE_NTOHL (0x636f6d6d), ACE_NTOHL (0x616e645f), ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line + 13, + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x0), // name = command_line CORBA::tk_string, 0U, // string length - 12, ACE_NTOHL (0x656e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment + 12, + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 - 16, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 + 16, + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 - 20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 + 20, + 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 (0x0), // name = name + 5, + ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x0), // name = name CORBA::tk_string, 0U, // string length - 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value + 6, + ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x65000000), // name = value CORBA::tk_string, 0U, // string length 0U, - 18, ACE_NTOHL (0x776f726b), ACE_NTOHL (0x696e675f), ACE_NTOHL (0x64697265), ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory + 18, + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x79000000), // name = working_directory CORBA::tk_string, 0U, // string length - 11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation + 11, + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 - 15, ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 + 15, + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count - 7, ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL - 7, ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL - 11, ACE_NTOHL (0x5045525f), ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT - 11, ACE_NTOHL (0x4155544f), ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START + 7, + ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x414c0000), // name = NORMAL + 7, + ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x414c0000), // name = MANUAL + 11, + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x4e540000), // name = PER_CLIENT + 11, + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x52540000), // name = AUTO_START }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_StartupOptions (CORBA::tk_struct, sizeof (_oc_ImplementationRepository_StartupOptions), (char *) &_oc_ImplementationRepository_StartupOptions, 0, sizeof (ImplementationRepository::StartupOptions)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_StartupOptions ( + CORBA::tk_struct, + sizeof (_oc_ImplementationRepository_StartupOptions), + (char *) &_oc_ImplementationRepository_StartupOptions, + 0, + sizeof (ImplementationRepository::StartupOptions) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StartupOptions, &_tc_TAO_tc_ImplementationRepository_StartupOptions) TAO_NAMESPACE_END + void ImplementationRepository::StartupOptions::_tao_any_destructor (void *x) { - ImplementationRepository::StartupOptions *tmp = ACE_static_cast (ImplementationRepository::StartupOptions*,x); + StartupOptions *tmp = ACE_static_cast (StartupOptions*,x); delete tmp; } 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 (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 - 18, ACE_NTOHL (0x53657276), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x666f726d), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation + 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 (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 + 18, + 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 (0x65720000), // name = logical_server + 15, + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x65720000), // name = logical_server CORBA::tk_string, 0U, // string length - 7, ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server + 7, + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x65720000), // name = server CORBA::tk_string, 0U, // string length - 8, ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup + 8, + ACE_NTOHL (0x73746172), + ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 560, // 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 - 15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 + 15, + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count - 13, ACE_NTOHL (0x636f6d6d), ACE_NTOHL (0x616e645f), ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line + 13, + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x0), // name = command_line CORBA::tk_string, 0U, // string length - 12, ACE_NTOHL (0x656e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment + 12, + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 - 16, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 + 16, + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 - 20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 + 20, + 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 (0x0), // name = name + 5, + ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x0), // name = name CORBA::tk_string, 0U, // string length - 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value + 6, + ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x65000000), // name = value CORBA::tk_string, 0U, // string length 0U, - 18, ACE_NTOHL (0x776f726b), ACE_NTOHL (0x696e675f), ACE_NTOHL (0x64697265), ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory + 18, + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x79000000), // name = working_directory CORBA::tk_string, 0U, // string length - 11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation + 11, + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 - 15, ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 + 15, + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count - 7, ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL - 7, ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL - 11, ACE_NTOHL (0x5045525f), ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT - 11, ACE_NTOHL (0x4155544f), ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - - - 9, ACE_NTOHL (0x6c6f6361), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location + 7, + ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x414c0000), // name = NORMAL + 7, + ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x414c0000), // name = MANUAL + 11, + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x4e540000), // name = PER_CLIENT + 11, + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x52540000), // name = AUTO_START + + + 9, + 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 - 8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address + 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 + 8, + ACE_NTOHL (0x41646472), + ACE_NTOHL (0x65737300), // name = Address CORBA::tk_string, 0U, // string length }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformation (CORBA::tk_struct, sizeof (_oc_ImplementationRepository_ServerInformation), (char *) &_oc_ImplementationRepository_ServerInformation, 0, sizeof (ImplementationRepository::ServerInformation)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformation ( + CORBA::tk_struct, + sizeof (_oc_ImplementationRepository_ServerInformation), + (char *) &_oc_ImplementationRepository_ServerInformation, + 0, + sizeof (ImplementationRepository::ServerInformation) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_ImplementationRepository_ServerInformation) TAO_NAMESPACE_END + void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x) { - ImplementationRepository::ServerInformation *tmp = ACE_static_cast (ImplementationRepository::ServerInformation*,x); + ServerInformation *tmp = ACE_static_cast (ServerInformation*,x); delete tmp; } @@ -725,7 +1486,7 @@ ImplementationRepository::ServerInformationList::~ServerInformationList (void) / {} void ImplementationRepository::ServerInformationList::_tao_any_destructor (void *x) { - ImplementationRepository::ServerInformationList *tmp = ACE_static_cast (ImplementationRepository::ServerInformationList*,x); + ServerInformationList *tmp = ACE_static_cast (ServerInformationList*,x); delete tmp; } @@ -735,80 +1496,239 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (void 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 (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 (0x74000000), // name = ServerInformationList + 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 (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 (0x74000000), // name = ServerInformationList CORBA::tk_sequence, // typecode kind 828, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind 812, // 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 (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 - 18, ACE_NTOHL (0x53657276), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x666f726d), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation + 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 (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 + 18, + 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 (0x65720000), // name = logical_server + 15, + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x65720000), // name = logical_server CORBA::tk_string, 0U, // string length - 7, ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server + 7, + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x65720000), // name = server CORBA::tk_string, 0U, // string length - 8, ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup + 8, + ACE_NTOHL (0x73746172), + ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 560, // 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 - 15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 + 15, + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count - 13, ACE_NTOHL (0x636f6d6d), ACE_NTOHL (0x616e645f), ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line + 13, + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x0), // name = command_line CORBA::tk_string, 0U, // string length - 12, ACE_NTOHL (0x656e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment + 12, + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 - 16, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 + 16, + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 - 20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable + 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 (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 + 20, + 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 (0x0), // name = name + 5, + ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x0), // name = name CORBA::tk_string, 0U, // string length - 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value + 6, + ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x65000000), // name = value CORBA::tk_string, 0U, // string length 0U, - 18, ACE_NTOHL (0x776f726b), ACE_NTOHL (0x696e675f), ACE_NTOHL (0x64697265), ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory + 18, + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x79000000), // name = working_directory CORBA::tk_string, 0U, // string length - 11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation + 11, + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 - 15, ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode + 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 + 15, + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count - 7, ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL - 7, ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL - 11, ACE_NTOHL (0x5045525f), ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT - 11, ACE_NTOHL (0x4155544f), ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - - - 9, ACE_NTOHL (0x6c6f6361), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location + 7, + ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x414c0000), // name = NORMAL + 7, + ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x414c0000), // name = MANUAL + 11, + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x4e540000), // name = PER_CLIENT + 11, + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x52540000), // name = AUTO_START + + + 9, + 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 - 8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address + 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 + 8, + ACE_NTOHL (0x41646472), + ACE_NTOHL (0x65737300), // name = Address CORBA::tk_string, 0U, // string length @@ -816,348 +1736,35 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 0U, }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationList (CORBA::tk_alias, sizeof (_oc_ImplementationRepository_ServerInformationList), (char *) &_oc_ImplementationRepository_ServerInformationList, 0, sizeof (ImplementationRepository::ServerInformationList)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationList ( + CORBA::tk_alias, + sizeof (_oc_ImplementationRepository_ServerInformationList), + (char *) &_oc_ImplementationRepository_ServerInformationList, + 0, + sizeof (ImplementationRepository::ServerInformationList) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList) TAO_NAMESPACE_END -void ImplementationRepository::Administration::_tao_any_destructor (void *x) -{ - ImplementationRepository::Administration *tmp = ACE_static_cast (ImplementationRepository::Administration*,x); - CORBA::release (tmp); -} - -ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -{ - if (CORBA::is_nil (obj)) - return Administration::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (Administration::_nil ()); - if (is_a == 0) - return Administration::_nil (); - return Administration::_unchecked_narrow (obj, ACE_TRY_ENV); -} - -ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) -{ - if (CORBA::is_nil (obj)) - return Administration::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - Administration_ptr default_proxy = Administration::_nil (); - if (obj->_is_collocated () && _TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer != 0) - { - default_proxy = _TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer (obj); - } - if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, Administration (stub), Administration::_nil ()); - return TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); -} - -ImplementationRepository::Administration_ptr -ImplementationRepository::Administration::_duplicate (Administration_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -} - -// default constructor -ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (void) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0") -{ -} - -// destructor - all members are of self managing types -ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered (void) -{ -} - -void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *x) -{ - ImplementationRepository::Administration::AlreadyRegistered *tmp = ACE_static_cast (ImplementationRepository::Administration::AlreadyRegistered*,x); - delete tmp; -} - -// copy constructor -ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) -{ - } - -// assignment operator -ImplementationRepository::Administration::AlreadyRegistered& -ImplementationRepository::Administration::AlreadyRegistered::operator= (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp) -{ - - this->CORBA_UserException::operator= (_tao_excp); - return *this; -} - -// narrow -ImplementationRepository::Administration::AlreadyRegistered * -ImplementationRepository::Administration::AlreadyRegistered::_downcast (CORBA::Exception *exc) -{ - if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (AlreadyRegistered *, exc); - else - return 0; -} - - -void ImplementationRepository::Administration::AlreadyRegistered::_raise () -{ - TAO_RAISE(*this); -} - - -void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( - TAO_OutputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) const -{ - if (cdr << *this) - return; - ACE_THROW (CORBA::MARSHAL ()); -} - - -void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode ( - TAO_InputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) -{ - if (cdr >> *this) - return; - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the _alloc method -CORBA::Exception *ImplementationRepository::Administration::AlreadyRegistered::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::AlreadyRegistered, 0); - return retval; -} -static const CORBA::Long _oc_ImplementationRepository_Administration_AlreadyRegistered[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 66, 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 (0x696f6e2f), ACE_NTOHL (0x416c7265), ACE_NTOHL (0x61647952), ACE_NTOHL (0x65676973), ACE_NTOHL (0x74657265), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0 - 18, ACE_NTOHL (0x416c7265), ACE_NTOHL (0x61647952), ACE_NTOHL (0x65676973), ACE_NTOHL (0x74657265), ACE_NTOHL (0x64000000), // name = AlreadyRegistered - 0, // member count -}; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_AlreadyRegistered (CORBA::tk_except, sizeof (_oc_ImplementationRepository_Administration_AlreadyRegistered), (char *) &_oc_ImplementationRepository_Administration_AlreadyRegistered, 0, sizeof (ImplementationRepository::Administration::AlreadyRegistered)); -CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_AlreadyRegistered = &_tc_TAO_tc_ImplementationRepository_Administration_AlreadyRegistered; - -CORBA::TypeCode_ptr -ImplementationRepository::Administration::AlreadyRegistered::_type (void) const -{ - return _tc_AlreadyRegistered; -} -// default constructor -ImplementationRepository::Administration::CannotActivate::CannotActivate (void) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0") -{ -} - -// destructor - all members are of self managing types -ImplementationRepository::Administration::CannotActivate::~CannotActivate (void) -{ -} - -void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *x) -{ - ImplementationRepository::Administration::CannotActivate *tmp = ACE_static_cast (ImplementationRepository::Administration::CannotActivate*,x); - delete tmp; -} - -// copy constructor -ImplementationRepository::Administration::CannotActivate::CannotActivate (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) -{ - this->reason = CORBA::string_dup (_tao_excp.reason.in ()); -} - -// assignment operator -ImplementationRepository::Administration::CannotActivate& -ImplementationRepository::Administration::CannotActivate::operator= (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp) -{ - - this->CORBA_UserException::operator= (_tao_excp); - this->reason = CORBA::string_dup (_tao_excp.reason.in ()); - return *this; -} - -// narrow -ImplementationRepository::Administration::CannotActivate * -ImplementationRepository::Administration::CannotActivate::_downcast (CORBA::Exception *exc) -{ - if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CannotActivate *, exc); - else - return 0; -} - - -void ImplementationRepository::Administration::CannotActivate::_raise () -{ - TAO_RAISE(*this); -} - - -void ImplementationRepository::Administration::CannotActivate::_tao_encode ( - TAO_OutputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) const -{ - if (cdr << *this) - return; - ACE_THROW (CORBA::MARSHAL ()); -} - - -void ImplementationRepository::Administration::CannotActivate::_tao_decode ( - TAO_InputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) -{ - if (cdr >> *this) - return; - ACE_THROW (CORBA::MARSHAL ()); -} - -// TAO extension - the _alloc method -CORBA::Exception *ImplementationRepository::Administration::CannotActivate::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::CannotActivate, 0); - return retval; -} - -ImplementationRepository::Administration::CannotActivate::CannotActivate ( - const char * _tao_reason -) - : CORBA_UserException (CORBA::string_dup ("IDL:ImplementationRepository/Administration/CannotActivate:1.0")) -{ - this->reason = CORBA::string_dup (_tao_reason); -} - -static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActivate[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 63, 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 (0x696f6e2f), ACE_NTOHL (0x43616e6e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x74653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/Administration/CannotActivate:1.0 - 15, ACE_NTOHL (0x43616e6e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x74650000), // name = CannotActivate - 1, // member count - 7, ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason - CORBA::tk_string, - 0U, // string length -}; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_CannotActivate (CORBA::tk_except, sizeof (_oc_ImplementationRepository_Administration_CannotActivate), (char *) &_oc_ImplementationRepository_Administration_CannotActivate, 0, sizeof (ImplementationRepository::Administration::CannotActivate)); -CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_CannotActivate = &_tc_TAO_tc_ImplementationRepository_Administration_CannotActivate; - -CORBA::TypeCode_ptr -ImplementationRepository::Administration::CannotActivate::_type (void) const -{ - return _tc_CannotActivate; -} - -// default constructor -ImplementationRepository::Administration::NotFound::NotFound (void) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/NotFound:1.0") -{ -} - -// destructor - all members are of self managing types -ImplementationRepository::Administration::NotFound::~NotFound (void) -{ -} - -void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *x) -{ - ImplementationRepository::Administration::NotFound *tmp = ACE_static_cast (ImplementationRepository::Administration::NotFound*,x); - delete tmp; -} - -// copy constructor -ImplementationRepository::Administration::NotFound::NotFound (const ::ImplementationRepository::Administration::NotFound &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) -{ - } - -// assignment operator -ImplementationRepository::Administration::NotFound& -ImplementationRepository::Administration::NotFound::operator= (const ::ImplementationRepository::Administration::NotFound &_tao_excp) -{ - - this->CORBA_UserException::operator= (_tao_excp); - return *this; -} - -// narrow -ImplementationRepository::Administration::NotFound * -ImplementationRepository::Administration::NotFound::_downcast (CORBA::Exception *exc) -{ - if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (NotFound *, exc); - else - return 0; -} - - -void ImplementationRepository::Administration::NotFound::_raise () -{ - TAO_RAISE(*this); -} - - -void ImplementationRepository::Administration::NotFound::_tao_encode ( - TAO_OutputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) const -{ - if (cdr << *this) - return; - ACE_THROW (CORBA::MARSHAL ()); -} - - -void ImplementationRepository::Administration::NotFound::_tao_decode ( - TAO_InputCDR &cdr, - CORBA::Environment &ACE_TRY_ENV) -{ - if (cdr >> *this) - return; - ACE_THROW (CORBA::MARSHAL ()); -} +/////////////////////////////////////////////////////////////////////// +// Base & Remote Proxy Implementation. +// -// TAO extension - the _alloc method -CORBA::Exception *ImplementationRepository::Administration::NotFound::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::NotFound, 0); - return retval; -} +ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void) +{} -static const CORBA::Long _oc_ImplementationRepository_Administration_NotFound[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 57, 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 (0x696f6e2f), ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0 - 9, ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0), // name = NotFound - 0, // member count -}; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_NotFound (CORBA::tk_except, sizeof (_oc_ImplementationRepository_Administration_NotFound), (char *) &_oc_ImplementationRepository_Administration_NotFound, 0, sizeof (ImplementationRepository::Administration::NotFound)); -CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_NotFound = &_tc_TAO_tc_ImplementationRepository_Administration_NotFound; +ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administration_Remote_Proxy_Impl (void) +{} -CORBA::TypeCode_ptr -ImplementationRepository::Administration::NotFound::_type (void) const -{ - return _tc_NotFound; -} +// Remote Implementation of the IDL interface methods -void ImplementationRepository::Administration::activate_server ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server ( + CORBA_Object *_collocated_tao_target_, const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1177,7 +1784,7 @@ void ImplementationRepository::Administration::activate_server ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1189,37 +1796,135 @@ void ImplementationRepository::Administration::activate_server ( 1, istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2, ACE_TRY_ENV); - ACE_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); + +#endif /* TAO_HAS_INTERCEPTORS */ + + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri ( + &_tao_call, + _collocated_tao_target_, + server, + ACE_TRY_ENV + ); + ACE_CHECK; + + ACE_TRY { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 } - break; - } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -void ImplementationRepository::Administration::register_server ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server ( + CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options, CORBA::Environment &ACE_TRY_ENV @@ -1238,7 +1943,7 @@ void ImplementationRepository::Administration::register_server ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1251,39 +1956,136 @@ void ImplementationRepository::Administration::register_server ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri ( + &_tao_call, + _collocated_tao_target_, + server, + options, + ACE_TRY_ENV + ); + ACE_CHECK; + + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) && + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) && (_tao_out << options) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK; + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; } - break; - } + + break; + } } -void ImplementationRepository::Administration::reregister_server ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server ( + CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options, CORBA::Environment &ACE_TRY_ENV @@ -1296,7 +2098,7 @@ void ImplementationRepository::Administration::reregister_server ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1308,38 +2110,137 @@ void ImplementationRepository::Administration::reregister_server ( 1, istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); + +#endif /* TAO_HAS_INTERCEPTORS */ + + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri ( + &_tao_call, + _collocated_tao_target_, + server, + options, + ACE_TRY_ENV + ); + ACE_CHECK; + + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) && + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) && (_tao_out << options) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; } - break; - } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -void ImplementationRepository::Administration::remove_server ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server ( + CORBA_Object *_collocated_tao_target_, const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1357,7 +2258,7 @@ void ImplementationRepository::Administration::remove_server ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1370,37 +2271,134 @@ void ImplementationRepository::Administration::remove_server ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri ( + &_tao_call, + _collocated_tao_target_, + server, + ACE_TRY_ENV + ); + ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK; + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; } - break; - } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } + } -void ImplementationRepository::Administration::shutdown_server ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server ( + CORBA_Object *_collocated_tao_target_, const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1418,7 +2416,7 @@ void ImplementationRepository::Administration::shutdown_server ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1431,39 +2429,134 @@ void ImplementationRepository::Administration::shutdown_server ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); + +#endif /* TAO_HAS_INTERCEPTORS */ + + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( + &_tao_call, + _collocated_tao_target_, + server, + ACE_TRY_ENV + ); + ACE_CHECK; - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK; + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _tao_call.restart_flag (1); + continue; } - break; + break; + } - } } -char * ImplementationRepository::Administration::server_is_running ( +char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running ( + CORBA_Object *_collocated_tao_target_, const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, @@ -1483,7 +2576,7 @@ char * ImplementationRepository::Administration::server_is_running ( CORBA::String_var _tao_safe_retval; - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); @@ -1496,49 +2589,157 @@ char * ImplementationRepository::Administration::server_is_running ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); + +#endif /* TAO_HAS_INTERCEPTORS */ + + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri ( + &_tao_call, + _collocated_tao_target_, + server, + addr, + server_object, + ACE_TRY_ENV + ); + ACE_CHECK_RETURN (0); + + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (0); - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK_RETURN (0); + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) && + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK_RETURN (0); + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK_RETURN (0); + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) && (_tao_out << addr) && (_tao_out << server_object) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (), 0); + )) + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::MARSHAL (), + 0 + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (0); + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + 0 + ); + + } + + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_safe_retval.inout ()) + )) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + 0 + ); + + } + + TAO_INTERCEPTOR ( + char * _tao_retval_info = _tao_safe_retval._retn (); + ri.result (_tao_retval_info); + _tao_safe_retval = _tao_retval_info; + ); + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); + ); + TAO_INTERCEPTOR_CHECK_RETURN (0); - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); - + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> _tao_safe_retval.inout ()) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (0); - break; +#endif /* TAO_HAS_INTERCEPTORS */ - } + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } return _tao_safe_retval._retn (); } -void ImplementationRepository::Administration::server_is_shutting_down ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1553,7 +2754,10 @@ void ImplementationRepository::Administration::server_is_shutting_down ( {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} }; - TAO_Stub *istub = this->_stubobj (); + + + + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1566,40 +2770,134 @@ void ImplementationRepository::Administration::server_is_shutting_down ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( + &_tao_call, + _collocated_tao_target_, + server, + ACE_TRY_ENV + ); + ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK; + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; - break; +#endif /* TAO_HAS_INTERCEPTORS */ - } + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -void ImplementationRepository::Administration::find ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( + CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info, CORBA::Environment &ACE_TRY_ENV @@ -1618,7 +2916,7 @@ void ImplementationRepository::Administration::find ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1632,44 +2930,144 @@ void ImplementationRepository::Administration::find ( istub->orb_core () ); +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); + +#endif /* TAO_HAS_INTERCEPTORS */ - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. - - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << server) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1, ACE_TRY_ENV); - ACE_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri ( + &_tao_call, + _collocated_tao_target_, + server, + ACE_TRY_ENV + ); + ACE_CHECK; + + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> *info.ptr ()) + )) + { + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> *info.ptr ()) - )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - break; + ACE_ENDTRY; + ACE_CHECK; - } +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -void ImplementationRepository::Administration::list ( +void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( + CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, @@ -1683,7 +3081,7 @@ void ImplementationRepository::Administration::list ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -1697,42 +3095,296 @@ void ImplementationRepository::Administration::list ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri ( + &_tao_call, + _collocated_tao_target_, + how_many +, + ACE_TRY_ENV + ); + ACE_CHECK; - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << how_many) - )) - ACE_THROW (CORBA::MARSHAL ()); - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; + ACE_TRY + { +#endif /* TAO_HAS_INTERCEPTORS */ - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << how_many) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); + + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> *server_list.ptr ()) && + (_tao_in >> server_iterator.ptr ()) + )) + { + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> *server_list.ptr ()) && - (_tao_in >> server_iterator.ptr ()) - )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); - break; + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } + +} + + +// +// End Base & Remote Proxy Implemeentation. +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote & Base Proxy Broker Implementation +// + +ImplementationRepository::_TAO_Administration_Proxy_Broker::_TAO_Administration_Proxy_Broker (void) +{ +} + +ImplementationRepository::_TAO_Administration_Proxy_Broker::~_TAO_Administration_Proxy_Broker (void) +{ +} +ImplementationRepository::_TAO_Administration_Proxy_Broker * (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + +// Factory Member function Implementation. +ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker * +ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::the_TAO_Administration_Remote_Proxy_Broker (void) +{ + static ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker remote_proxy_broker; + return &remote_proxy_broker; +} + +ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::_TAO_Administration_Remote_Proxy_Broker (void) +{ +} + +ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Administration_Remote_Proxy_Broker (void) +{ +} + +ImplementationRepository::_TAO_Administration_Proxy_Impl& +ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy ( + ::ImplementationRepository::Administration *, + CORBA::Environment & +) +{ + return this->remote_proxy_impl_; +} + + +// +// End Remote & Base Proxy Broker Implementation +/////////////////////////////////////////////////////////////////////// + + +// default constructor +ImplementationRepository::Administration::Administration (int collocated) +{ + this->ImplementationRepository_Administration_setup_collocation (collocated); +} + +// destructor +ImplementationRepository::Administration::~Administration (void) +{} + +void +ImplementationRepository::Administration::ImplementationRepository_Administration_setup_collocation (int collocated) +{ + if (collocated) + this->the_TAO_Administration_Proxy_Broker_ = + ::ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer (this); + else + this->the_TAO_Administration_Proxy_Broker_ = + ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::the_TAO_Administration_Remote_Proxy_Broker (); +} + +void ImplementationRepository::Administration::_tao_any_destructor (void *x) +{ + Administration *tmp = ACE_static_cast (Administration*,x); + CORBA::release (tmp); +} + +ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV + ) +{ + if (CORBA::is_nil (obj)) + return Administration::_nil (); + if (! obj->_is_local ()) + { + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0", ACE_TRY_ENV); + ACE_CHECK_RETURN (Administration::_nil ()); + if (is_a == 0) + return Administration::_nil (); + } + return Administration::_unchecked_narrow (obj, ACE_TRY_ENV); +} + +ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment & + ) +{ + if (CORBA::is_nil (obj)) + return Administration::_nil (); + if (! obj->_is_local ()) + { + TAO_Stub* stub = obj->_stubobj (); + if (stub) + stub->_incr_refcnt (); + Administration_ptr default_proxy = Administration::_nil (); + + if ( + !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && + obj->_is_collocated () &&ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer != 0 + ) + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::Administration ( + stub, + 1, + obj->_servant ()), + + Administration::_nil ()); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::Administration (stub, 0, obj->_servant ()), Administration::_nil ()); + return default_proxy; } + else + return + ACE_reinterpret_cast + ( + Administration_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &Administration::_narrow + ) + ) + ); +} +ImplementationRepository::Administration_ptr +ImplementationRepository::Administration::_duplicate (Administration_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; } CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -1745,107 +3397,433 @@ CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Cha return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); } +void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; +} + const char* ImplementationRepository::Administration::_interface_repository_id (void) const { return "IDL:ImplementationRepository/Administration:1.0"; } -ImplementationRepository::TAO_ImplementationRepository_Administration_Default_Proxy_Factory::TAO_ImplementationRepository_Administration_Default_Proxy_Factory (int register_proxy_factory) +// Default constructor. +ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (void) + : CORBA_UserException ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0") +{ +} + +// Destructor - all members are of self managing types. +ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered (void) +{ +} + +void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *x) +{ + AlreadyRegistered *tmp = ACE_static_cast (AlreadyRegistered*,x); + delete tmp; +} + +// Copy constructor. +ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp) + : CORBA_UserException (_tao_excp._id ()) +{ +} + +// Assignment operator. +ImplementationRepository::Administration::AlreadyRegistered& +ImplementationRepository::Administration::AlreadyRegistered::operator= (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp) { - if (register_proxy_factory) + this->CORBA_UserException::operator= (_tao_excp); + return *this; +} + +// Narrow. +ImplementationRepository::Administration::AlreadyRegistered * +ImplementationRepository::Administration::AlreadyRegistered::_downcast (CORBA::Exception *exc) +{ + if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ())) { - TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); + return ACE_dynamic_cast (AlreadyRegistered *, exc); + } + else + { + return 0; } } -ImplementationRepository::TAO_ImplementationRepository_Administration_Default_Proxy_Factory::~TAO_ImplementationRepository_Administration_Default_Proxy_Factory (void) +void ImplementationRepository::Administration::AlreadyRegistered::_raise () { + TAO_RAISE (*this); } -ImplementationRepository::Administration_ptr -ImplementationRepository::TAO_ImplementationRepository_Administration_Default_Proxy_Factory::create_proxy ( - ::ImplementationRepository::Administration_ptr proxy, - CORBA::Environment & +void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( + TAO_OutputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV + ) const +{ + if (cdr << *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode ( + TAO_InputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV ) { - return proxy; + if (cdr >> *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); } -ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter (void) - : proxy_factory_ (0), - delete_proxy_factory_ (0) +// TAO extension - the _alloc method. +CORBA::Exception *ImplementationRepository::Administration::AlreadyRegistered::_alloc (void) { + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::AlreadyRegistered, 0); + return retval; } -ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter::~TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter (void) +static const CORBA::Long _oc_ImplementationRepository_Administration_AlreadyRegistered[] = { - // Making sure the factory which the adapter has is destroyed with it. - if (this->proxy_factory_ != 0) - delete this->proxy_factory_; + TAO_ENCAP_BYTE_ORDER, // byte order + 66, + 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 (0x696f6e2f), + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647952), + ACE_NTOHL (0x65676973), + ACE_NTOHL (0x74657265), + ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0 + 18, + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647952), + ACE_NTOHL (0x65676973), + ACE_NTOHL (0x74657265), + ACE_NTOHL (0x64000000), // name = AlreadyRegistered + 0, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_AlreadyRegistered ( + CORBA::tk_except, + sizeof (_oc_ImplementationRepository_Administration_AlreadyRegistered), + (char *) &_oc_ImplementationRepository_Administration_AlreadyRegistered, + 0, + sizeof (ImplementationRepository::Administration::AlreadyRegistered) + ); + +CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_AlreadyRegistered = + &_tc_TAO_tc_ImplementationRepository_Administration_AlreadyRegistered; + + +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr ImplementationRepository::Administration::AlreadyRegistered::_type (void) const +{ + return ::ImplementationRepository::Administration::_tc_AlreadyRegistered; } -int -ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter::register_proxy_factory ( - TAO_ImplementationRepository_Administration_Default_Proxy_Factory *df, - CORBA::Environment &ACE_TRY_ENV - ) +// Default constructor. +ImplementationRepository::Administration::CannotActivate::CannotActivate (void) + : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0") { - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - // Remove any existing <proxy_factory_> and replace with the new one. - this->unregister_proxy_factory (ACE_TRY_ENV); - this->proxy_factory_ = df; - this->delete_proxy_factory_ = 0; -return 0; } -int -ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter::unregister_proxy_factory ( - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) - { - // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is - // invoked in the destructor of the class too. - this->delete_proxy_factory_ = 1; - delete this->proxy_factory_; - this->proxy_factory_ = 0; +// Destructor - all members are of self managing types. +ImplementationRepository::Administration::CannotActivate::~CannotActivate (void) +{ +} + +void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *x) +{ + CannotActivate *tmp = ACE_static_cast (CannotActivate*,x); + delete tmp; +} + +// Copy constructor. +ImplementationRepository::Administration::CannotActivate::CannotActivate (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp) + : CORBA_UserException (_tao_excp._id ()) +{ + this->reason = CORBA::string_dup (_tao_excp.reason.in ()); +} + +// Assignment operator. +ImplementationRepository::Administration::CannotActivate& +ImplementationRepository::Administration::CannotActivate::operator= (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp) +{ + this->CORBA_UserException::operator= (_tao_excp); + this->reason = CORBA::string_dup (_tao_excp.reason.in ()); + return *this; +} + +// Narrow. +ImplementationRepository::Administration::CannotActivate * +ImplementationRepository::Administration::CannotActivate::_downcast (CORBA::Exception *exc) +{ + if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ())) + { + return ACE_dynamic_cast (CannotActivate *, exc); + } + else + { + return 0; } -return 0; } -ImplementationRepository::Administration_ptr -ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter::create_proxy ( - ::ImplementationRepository::Administration_ptr proxy, - CORBA::Environment & +void ImplementationRepository::Administration::CannotActivate::_raise () +{ + TAO_RAISE (*this); +} + +void ImplementationRepository::Administration::CannotActivate::_tao_encode ( + TAO_OutputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV + ) const +{ + if (cdr << *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +void ImplementationRepository::Administration::CannotActivate::_tao_decode ( + TAO_InputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV ) { - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - // Verify that an <proxy_factory_> is available else make one. - if (this->proxy_factory_ == 0) - ACE_NEW_RETURN (this->proxy_factory_, - TAO_ImplementationRepository_Administration_Default_Proxy_Factory (1), - 0); + if (cdr >> *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +// TAO extension - the _alloc method. +CORBA::Exception *ImplementationRepository::Administration::CannotActivate::_alloc (void) +{ + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::CannotActivate, 0); + return retval; +} + +ImplementationRepository::Administration::CannotActivate::CannotActivate ( + const char * _tao_reason + ) + : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0") +{ + this->reason = CORBA::string_dup (_tao_reason); +} + +static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActivate[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 63, + 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 (0x696f6e2f), + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697661), + ACE_NTOHL (0x74653a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/Administration/CannotActivate:1.0 + 15, + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697661), + ACE_NTOHL (0x74650000), // name = CannotActivate + 1, // member count + 7, + ACE_NTOHL (0x72656173), + ACE_NTOHL (0x6f6e0000), // name = reason + CORBA::tk_string, + 0U, // string length +}; + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_CannotActivate ( + CORBA::tk_except, + sizeof (_oc_ImplementationRepository_Administration_CannotActivate), + (char *) &_oc_ImplementationRepository_Administration_CannotActivate, + 0, + sizeof (ImplementationRepository::Administration::CannotActivate) + ); + +CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_CannotActivate = + &_tc_TAO_tc_ImplementationRepository_Administration_CannotActivate; + + +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr ImplementationRepository::Administration::CannotActivate::_type (void) const +{ + return ::ImplementationRepository::Administration::_tc_CannotActivate; +} + +// Default constructor. +ImplementationRepository::Administration::NotFound::NotFound (void) + : CORBA_UserException ("IDL:ImplementationRepository/Administration/NotFound:1.0") +{ +} + +// Destructor - all members are of self managing types. +ImplementationRepository::Administration::NotFound::~NotFound (void) +{ +} + +void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *x) +{ + NotFound *tmp = ACE_static_cast (NotFound*,x); + delete tmp; +} + +// Copy constructor. +ImplementationRepository::Administration::NotFound::NotFound (const ::ImplementationRepository::Administration::NotFound &_tao_excp) + : CORBA_UserException (_tao_excp._id ()) +{ +} + +// Assignment operator. +ImplementationRepository::Administration::NotFound& +ImplementationRepository::Administration::NotFound::operator= (const ::ImplementationRepository::Administration::NotFound &_tao_excp) +{ + this->CORBA_UserException::operator= (_tao_excp); + return *this; +} + +// Narrow. +ImplementationRepository::Administration::NotFound * +ImplementationRepository::Administration::NotFound::_downcast (CORBA::Exception *exc) +{ + if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ())) + { + return ACE_dynamic_cast (NotFound *, exc); + } + else + { + return 0; + } +} + +void ImplementationRepository::Administration::NotFound::_raise () +{ + TAO_RAISE (*this); +} + +void ImplementationRepository::Administration::NotFound::_tao_encode ( + TAO_OutputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV + ) const +{ + if (cdr << *this) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} +void ImplementationRepository::Administration::NotFound::_tao_decode ( + TAO_InputCDR &cdr, + CORBA::Environment &ACE_TRY_ENV + ) +{ + if (cdr >> *this) + { + return; + } - return this->proxy_factory_->create_proxy (proxy); + ACE_THROW (CORBA::MARSHAL ()); } -ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::TAO_ImplementationRepository_Administration_Smart_Proxy_Base (::ImplementationRepository::Administration_ptr proxy) -: base_proxy_ (proxy) +// TAO extension - the _alloc method. +CORBA::Exception *ImplementationRepository::Administration::NotFound::_alloc (void) { + CORBA::Exception *retval = 0; + ACE_NEW_RETURN (retval, ::ImplementationRepository::Administration::NotFound, 0); + return retval; } -ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::~TAO_ImplementationRepository_Administration_Smart_Proxy_Base (void) +static const CORBA::Long _oc_ImplementationRepository_Administration_NotFound[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 57, + 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 (0x696f6e2f), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0 + 9, + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x0), // name = NotFound + 0, // member count +}; + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_NotFound ( + CORBA::tk_except, + sizeof (_oc_ImplementationRepository_Administration_NotFound), + (char *) &_oc_ImplementationRepository_Administration_NotFound, + 0, + sizeof (ImplementationRepository::Administration::NotFound) + ); + +CORBA::TypeCode_ptr ImplementationRepository::Administration::_tc_NotFound = + &_tc_TAO_tc_ImplementationRepository_Administration_NotFound; + + +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr ImplementationRepository::Administration::NotFound::_type (void) const { + return ::ImplementationRepository::Administration::_tc_NotFound; } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::activate_server ( +void ImplementationRepository::Administration::activate_server ( const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1855,14 +3833,18 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart ImplementationRepository::Administration::CannotActivate )) { - this->base_proxy_->activate_server ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.activate_server ( + this, server, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::register_server ( +void ImplementationRepository::Administration::register_server ( const char * server, const ImplementationRepository::StartupOptions & options, CORBA::Environment &ACE_TRY_ENV @@ -1872,15 +3854,19 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart ImplementationRepository::Administration::AlreadyRegistered )) { - this->base_proxy_->register_server ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.register_server ( + this, server, options, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::reregister_server ( +void ImplementationRepository::Administration::reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options, CORBA::Environment &ACE_TRY_ENV @@ -1889,15 +3875,19 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart CORBA::SystemException )) { - this->base_proxy_->reregister_server ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.reregister_server ( + this, server, options, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::remove_server ( +void ImplementationRepository::Administration::remove_server ( const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1906,14 +3896,18 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart ImplementationRepository::Administration::NotFound )) { - this->base_proxy_->remove_server ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.remove_server ( + this, server, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::shutdown_server ( +void ImplementationRepository::Administration::shutdown_server ( const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1922,14 +3916,18 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart ImplementationRepository::Administration::NotFound )) { - this->base_proxy_->shutdown_server ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.shutdown_server ( + this, server, ACE_TRY_ENV ); - } -char * ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::server_is_running ( +char * ImplementationRepository::Administration::server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, @@ -1940,16 +3938,20 @@ char * ImplementationRepository::TAO_ImplementationRepository_Administration_Sma ImplementationRepository::Administration::NotFound )) { - return this->base_proxy_->server_is_running ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return proxy.server_is_running ( + this, server, addr, server_object, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::server_is_shutting_down ( +void ImplementationRepository::Administration::server_is_shutting_down ( const char * server, CORBA::Environment &ACE_TRY_ENV ) @@ -1958,14 +3960,18 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart ImplementationRepository::Administration::NotFound )) { - this->base_proxy_->server_is_shutting_down ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.server_is_shutting_down ( + this, server, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::find ( +void ImplementationRepository::Administration::find ( const char * server, ImplementationRepository::ServerInformation_out info, CORBA::Environment &ACE_TRY_ENV @@ -1975,15 +3981,19 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart ImplementationRepository::Administration::NotFound )) { - this->base_proxy_->find ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.find ( + this, server, info, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart_Proxy_Base::list ( +void ImplementationRepository::Administration::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, @@ -1993,81 +4003,718 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart CORBA::SystemException )) { - this->base_proxy_->list ( + _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.list ( + this, how_many, server_list, server_iterator, ACE_TRY_ENV ); +} + +#if (TAO_HAS_INTERCEPTORS == 1) +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); -static const CORBA::Long _oc_ImplementationRepository_Administration[] = + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, + {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + }; + + exception_list->length (2); + for (CORBA::ULong i = 0; i < 2; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - 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 (0x312e3000), // repository ID = IDL:ImplementationRepository/Administration:1.0 - 15, ACE_NTOHL (0x41646d69), ACE_NTOHL (0x6e697374), ACE_NTOHL (0x72617469), ACE_NTOHL (0x6f6e0000), // name = Administration -}; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (CORBA::tk_objref, sizeof (_oc_ImplementationRepository_Administration), (char *) &_oc_ImplementationRepository_Administration, 0, sizeof (ImplementationRepository::Administration)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (ImplementationRepository) -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) -TAO_NAMESPACE_END -void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *x) + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server), + options_ (options) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - ImplementationRepository::ServerInformationIterator *tmp = ACE_static_cast (ImplementationRepository::ServerInformationIterator*,x); - CORBA::release (tmp); + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; + + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment & ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server), + options_ (options) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - if (CORBA::is_nil (obj)) - return ServerInformationIterator::_nil (); - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0", ACE_TRY_ENV); - ACE_CHECK_RETURN (ServerInformationIterator::_nil ()); - if (is_a == 0) - return ServerInformationIterator::_nil (); - return ServerInformationIterator::_unchecked_narrow (obj, ACE_TRY_ENV); + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; + + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( - CORBA::Object_ptr obj, +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, CORBA::Environment & ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - if (CORBA::is_nil (obj)) - return ServerInformationIterator::_nil (); - TAO_Stub* stub = obj->_stubobj (); - stub->_incr_refcnt (); - ServerInformationIterator_ptr default_proxy = ServerInformationIterator::_nil (); - if (obj->_is_collocated () && _TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer != 0) + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) { - default_proxy = _TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer (obj); + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; } - if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, ServerInformationIterator (stub), ServerInformationIterator::_nil ()); - return TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); + + return safe_exception_list._retn (); } -ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj) + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; } -CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server), + addr_ (addr), + server_object_ (server_object) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_addr = parameter_list->length (); + parameter_list->length (length_addr + 1); + (*parameter_list)[length_addr].argument <<= addr_; + (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_server_object = parameter_list->length (); + parameter_list->length (length_server_object + 1); + (*parameter_list)[length_server_object].argument <<= this->server_object_; + + (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 0; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + CORBA::Any_var safe_result_any = result_any; + + (*result_any) <<= this->_result; + return safe_result_any._retn (); +} + +void +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) +{ + // update the result + this->_result = result; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const CORBA::ULong & how_many +, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + how_many_ (how_many) + +{} + +Dynamic::ParameterList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; + + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} + + +CORBA::Any * +ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +#endif /* TAO_HAS_INTERCEPTORS */ +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 (0x312e3000), // repository ID = IDL:ImplementationRepository/Administration:1.0 + 15, + ACE_NTOHL (0x41646d69), + ACE_NTOHL (0x6e697374), + ACE_NTOHL (0x72617469), + ACE_NTOHL (0x6f6e0000), // name = Administration +}; + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration ( + CORBA::tk_objref, + sizeof (_oc_ImplementationRepository_Administration), + (char *) &_oc_ImplementationRepository_Administration, + 0, + sizeof (ImplementationRepository::Administration) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (ImplementationRepository) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) +TAO_NAMESPACE_END + + +/////////////////////////////////////////////////////////////////////// +// Base & Remote Proxy Implementation. +// + +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void) +{} + +ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) +{} + +// Remote Implementation of the IDL interface methods + +CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::next_n ( + CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, CORBA::Environment &ACE_TRY_ENV @@ -2080,12 +4727,12 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( CORBA::Boolean _tao_retval = 0; - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, _tao_retval); + ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, 0); TAO_GIOP_Twoway_Invocation _tao_call ( istub, "next_n", @@ -2093,49 +4740,154 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( 1, istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); - - ACE_CHECK_RETURN (_tao_retval); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - if (!( - (_tao_out << how_many) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); +#endif /* TAO_HAS_INTERCEPTORS */ - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (_tao_retval); + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; + +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( + &_tao_call, + _collocated_tao_target_, + how_many, + ACE_TRY_ENV + ); + ACE_CHECK_RETURN (_tao_retval); - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + ACE_TRY { - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << how_many) + )) + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::MARSHAL (), + _tao_retval + ); + + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + _tao_retval + ); + + } + + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) && + (_tao_in >> *server_list.ptr ()) + )) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + _tao_retval + ); + + } + + TAO_INTERCEPTOR ( + CORBA::Boolean _tao_retval_info = _tao_retval; + ri.result (_tao_retval_info); + ); + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + +#if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; } - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - if (!( - (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) && - (_tao_in >> *server_list.ptr ()) - )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK_RETURN (_tao_retval); - break; +#endif /* TAO_HAS_INTERCEPTORS */ - } + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } return _tao_retval; } -void ImplementationRepository::ServerInformationIterator::destroy ( +void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy ( + CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( @@ -2146,7 +4898,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( - TAO_Stub *istub = this->_stubobj (); + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); @@ -2159,145 +4911,308 @@ void ImplementationRepository::ServerInformationIterator::destroy ( istub->orb_core () ); - for (;;) - { - _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); - CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - // Tremporary hack until GIOP 1.2 is implemented. +#endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); - ACE_CHECK; + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; - int _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); - ACE_CHECK; +#if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( + &_tao_call, + _collocated_tao_target_, + ACE_TRY_ENV + ); + ACE_CHECK; - if (_invoke_status == TAO_INVOKE_RESTART) - continue; - if (_invoke_status != TAO_INVOKE_OK) + ACE_TRY { - ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); + + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, + ACE_TRY_ENV + ) + ); + TAO_INTERCEPTOR_CHECK; + + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); + + } + + + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) + { + _tao_vfr.receive_reply ( + &ri, + ACE_TRY_ENV + ); + } + else + { + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + } + + ); + TAO_INTERCEPTOR_CHECK; + +#if TAO_HAS_INTERCEPTORS == 1 } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.receive_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; - break; +#endif /* TAO_HAS_INTERCEPTORS */ - } + if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + continue; + } + + break; + } } -CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) + +// +// End Base & Remote Proxy Implemeentation. +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote & Base Proxy Broker Implementation +// + +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker::_TAO_ServerInformationIterator_Proxy_Broker (void) { - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) - return 1; // success using local knowledge - else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); } -const char* ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker::~_TAO_ServerInformationIterator_Proxy_Broker (void) { - return "IDL:ImplementationRepository/ServerInformationIterator:1.0"; } -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory::TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (int register_proxy_factory) +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + +// Factory Member function Implementation. +ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker * +ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void) { - if (register_proxy_factory) - { - TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); - } + static ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker remote_proxy_broker; + return &remote_proxy_broker; } -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory::~TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (void) +ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::_TAO_ServerInformationIterator_Remote_Proxy_Broker (void) { } -ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory::create_proxy ( - ::ImplementationRepository::ServerInformationIterator_ptr proxy, - CORBA::Environment & - ) +ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void) { - return proxy; } -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter (void) - : proxy_factory_ (0), - delete_proxy_factory_ (0) +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& +ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy ( + ::ImplementationRepository::ServerInformationIterator *, + CORBA::Environment & +) { + return this->remote_proxy_impl_; } -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter::~TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter (void) + +// +// End Remote & Base Proxy Broker Implementation +/////////////////////////////////////////////////////////////////////// + + +// default constructor +ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated) { - // Making sure the factory which the adapter has is destroyed with it. - if (this->proxy_factory_ != 0) - delete this->proxy_factory_; + this->ImplementationRepository_ServerInformationIterator_setup_collocation (collocated); } -int -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter::register_proxy_factory ( - TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *df, - CORBA::Environment &ACE_TRY_ENV - ) +// destructor +ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void) +{} + +void +ImplementationRepository::ServerInformationIterator::ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated) { - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - // Remove any existing <proxy_factory_> and replace with the new one. - this->unregister_proxy_factory (ACE_TRY_ENV); - this->proxy_factory_ = df; - this->delete_proxy_factory_ = 0; -return 0; + if (collocated) + this->the_TAO_ServerInformationIterator_Proxy_Broker_ = + ::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer (this); + else + this->the_TAO_ServerInformationIterator_Proxy_Broker_ = + ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::the_TAO_ServerInformationIterator_Remote_Proxy_Broker (); } -int -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter::unregister_proxy_factory ( - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) - { - // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is - // invoked in the destructor of the class too. - this->delete_proxy_factory_ = 1; - delete this->proxy_factory_; - this->proxy_factory_ = 0; +void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *x) +{ + ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator*,x); + CORBA::release (tmp); +} + +ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV + ) +{ + if (CORBA::is_nil (obj)) + return ServerInformationIterator::_nil (); + if (! obj->_is_local ()) + { + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0", ACE_TRY_ENV); + ACE_CHECK_RETURN (ServerInformationIterator::_nil ()); + if (is_a == 0) + return ServerInformationIterator::_nil (); } -return 0; + return ServerInformationIterator::_unchecked_narrow (obj, ACE_TRY_ENV); } -ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter::create_proxy ( - ::ImplementationRepository::ServerInformationIterator_ptr proxy, +ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( + CORBA::Object_ptr obj, CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - this->lock_, 0)); - // Verify that an <proxy_factory_> is available else make one. - if (this->proxy_factory_ == 0) - ACE_NEW_RETURN (this->proxy_factory_, - TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (1), - 0); + if (CORBA::is_nil (obj)) + return ServerInformationIterator::_nil (); + if (! obj->_is_local ()) + { + TAO_Stub* stub = obj->_stubobj (); + if (stub) + stub->_incr_refcnt (); + ServerInformationIterator_ptr default_proxy = ServerInformationIterator::_nil (); + + if ( + !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && + obj->_is_collocated () &&ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer != 0 + ) + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::ServerInformationIterator ( + stub, + 1, + obj->_servant ()), + ServerInformationIterator::_nil ()); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerInformationIterator (stub, 0, obj->_servant ()), ServerInformationIterator::_nil ()); + return default_proxy; + } + else + return + ACE_reinterpret_cast + ( + ServerInformationIterator_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServerInformationIterator::_narrow + ) + ) + ); +} - return this->proxy_factory_->create_proxy (proxy); +ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) +{ + if ( + (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) + return 1; // success using local knowledge + else + return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); } -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base::TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base (::ImplementationRepository::ServerInformationIterator_ptr proxy) -: base_proxy_ (proxy) +void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type) { + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); + + if (retv) + this->_add_ref (); + return retv; } -ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base::~TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base (void) +const char* ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const { + return "IDL:ImplementationRepository/ServerInformationIterator:1.0"; } -CORBA::Boolean ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base::next_n ( +CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, CORBA::Environment &ACE_TRY_ENV @@ -2306,48 +5221,191 @@ CORBA::Boolean ImplementationRepository::TAO_ImplementationRepository_ServerInfo CORBA::SystemException )) { - return this->base_proxy_->next_n ( + _TAO_ServerInformationIterator_Proxy_Impl &proxy = + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return proxy.next_n ( + this, how_many, server_list, ACE_TRY_ENV ); - } -void ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base::destroy ( +void ImplementationRepository::ServerInformationIterator::destroy ( CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->base_proxy_->destroy ( + _TAO_ServerInformationIterator_Proxy_Impl &proxy = + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; + + proxy.destroy ( + this, ACE_TRY_ENV ); +} + +#if (TAO_HAS_INTERCEPTORS == 1) +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const CORBA::ULong & how_many, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + how_many_ (how_many) +{} + +Dynamic::ParameterList * +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +Dynamic::ExceptionList * +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} + + +CORBA::Any * +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 0; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + CORBA::Any_var safe_result_any = result_any; + + (*result_any) <<= CORBA::Any::from_boolean (this->_result); + return safe_result_any._retn (); +} + +void +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) +{ + // update the result + this->_result = result; +} + +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target) +{} + +Dynamic::ParameterList * +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return parameter_list; +} + +Dynamic::ExceptionList * +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} + +CORBA::Any * +ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +#endif /* TAO_HAS_INTERCEPTORS */ 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 (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 (0x72000000), // name = ServerInformationIterator + 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 (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 (0x72000000), // name = ServerInformationIterator }; -static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIterator (CORBA::tk_objref, sizeof (_oc_ImplementationRepository_ServerInformationIterator), (char *) &_oc_ImplementationRepository_ServerInformationIterator, 0, sizeof (ImplementationRepository::ServerInformationIterator)); + +static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIterator ( + CORBA::tk_objref, + sizeof (_oc_ImplementationRepository_ServerInformationIterator), + (char *) &_oc_ImplementationRepository_ServerInformationIterator, + 0, + sizeof (ImplementationRepository::ServerInformationIterator) + ); + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationIterator, &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator) TAO_NAMESPACE_END -ImplementationRepository::ServerObject_ptr (*_TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; + void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_ptr _tao_elem) { TAO_OutputCDR stream; @@ -2370,11 +5428,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::ServerObject::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -2402,9 +5462,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var> + template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentVariable &_tao_elem) // copying @@ -2434,7 +5494,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::EnvironmentVar CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::EnvironmentVariable *&_tao_elem) { - return _tao_any >>= ACE_const_cast (const ImplementationRepository::EnvironmentVariable *&, _tao_elem); + return _tao_any >>= ACE_const_cast(const ImplementationRepository::EnvironmentVariable*&,_tao_elem); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentVariable *&_tao_elem) @@ -2443,11 +5503,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2532,11 +5594,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2593,11 +5657,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -2642,7 +5708,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::StartupOptions CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::StartupOptions *&_tao_elem) { - return _tao_any >>= ACE_const_cast (const ImplementationRepository::StartupOptions *&, _tao_elem); + return _tao_any >>= ACE_const_cast(const ImplementationRepository::StartupOptions*&,_tao_elem); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::StartupOptions *&_tao_elem) @@ -2651,11 +5717,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2723,7 +5791,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformation *&_tao_elem) { - return _tao_any >>= ACE_const_cast (const ImplementationRepository::ServerInformation *&, _tao_elem); + return _tao_any >>= ACE_const_cast(const ImplementationRepository::ServerInformation*&,_tao_elem); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::ServerInformation *&_tao_elem) @@ -2732,11 +5800,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2809,8 +5879,8 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformationList *&_tao_elem) { - return _tao_any >>= ACE_const_cast ( - const ImplementationRepository::ServerInformationList *&, + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::ServerInformationList*&, _tao_elem ); } @@ -2821,11 +5891,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -2866,9 +5938,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo return 0; } -ImplementationRepository::Administration_ptr (*_TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration_ptr _tao_elem) { TAO_OutputCDR stream; @@ -2891,11 +5960,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::Administration::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -2923,9 +5994,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var> + template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administration::AlreadyRegistered &_tao_elem) // copying @@ -2955,8 +6026,8 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem) { - return _tao_any >>= ACE_const_cast ( - const ImplementationRepository::Administration::AlreadyRegistered *&, + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::Administration::AlreadyRegistered*&, _tao_elem ); } @@ -2967,11 +6038,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value (); @@ -2985,6 +6058,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); + CORBA::String_var interface_repository_id; + if (!(stream >> interface_repository_id.out ())) + return 0; + if (ACE_OS::strcmp ( + interface_repository_id.in (), + "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0")) + return 0; if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( @@ -3036,8 +6116,8 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::CannotActivate *&_tao_elem) { - return _tao_any >>= ACE_const_cast ( - const ImplementationRepository::Administration::CannotActivate *&, + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::Administration::CannotActivate*&, _tao_elem ); } @@ -3048,11 +6128,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value (); @@ -3066,6 +6148,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); + CORBA::String_var interface_repository_id; + if (!(stream >> interface_repository_id.out ())) + return 0; + if (ACE_OS::strcmp ( + interface_repository_id.in (), + "IDL:ImplementationRepository/Administration/CannotActivate:1.0")) + return 0; if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( @@ -3117,8 +6206,8 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::NotFound *&_tao_elem) { - return _tao_any >>= ACE_const_cast ( - const ImplementationRepository::Administration::NotFound *&, + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::Administration::NotFound*&, _tao_elem ); } @@ -3129,11 +6218,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + if (_tao_any.any_owns_data ()) { _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value (); @@ -3147,6 +6238,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); + CORBA::String_var interface_repository_id; + if (!(stream >> interface_repository_id.out ())) + return 0; + if (ACE_OS::strcmp ( + interface_repository_id.in (), + "IDL:ImplementationRepository/Administration/NotFound:1.0")) + return 0; if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( @@ -3171,9 +6269,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo return 0; } -ImplementationRepository::ServerInformationIterator_ptr (*_TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformationIterator_ptr _tao_elem) { TAO_OutputCDR stream; @@ -3196,11 +6291,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::ServerInformationIterator::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV)) // not equal - { - return 0; - } + + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV); ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () @@ -3228,9 +6325,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var> + template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ CORBA::Boolean operator<< ( diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index 121ab40bf05..b8861c31121 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -1,35 +1,39 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOC_H_ -#define _TAO_IDL_IMPLREPOC_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_ORIG_IMPLREPOC_H_ +#define _TAO_IDL_ORIG_IMPLREPOC_H_ -#include "portableserver_export.h" -#include "tao/Object.h" -#include "tao/Managed_Types.h" -#include "tao/Sequence.h" -#include "tao/Exception.h" -#include "tao/Environment.h" +#include "ace/pre.h" +#include "tao/corbafwd.h" #include "tao/CDR.h" #include "tao/Any.h" -#include "tao/Typecode.h" -#include "tao/TAO_Singleton.h" - -#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -#include "ace/streams.h" -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ +#include "tao/Object.h" +#include "tao/ClientRequestInfo.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 @@ -50,6 +54,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + TAO_NAMESPACE ImplementationRepository { @@ -69,7 +77,7 @@ TAO_NAMESPACE ImplementationRepository { public: ServerObject_var (void); // default constructor - ServerObject_var (ServerObject_ptr); + ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} ServerObject_var (const ServerObject_var &); // copy constructor ~ServerObject_var (void); // destructor @@ -124,7 +132,13 @@ TAO_NAMESPACE ImplementationRepository #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_ -class TAO_PortableServer_Export ServerObject : public virtual ACE_CORBA_1 (Object) +// Forward Classes Declaration + class _TAO_ServerObject_Proxy_Impl; + class _TAO_ServerObject_Remote_Proxy_Impl; + class _TAO_ServerObject_Proxy_Broker; + class _TAO_ServerObject_Remote_Proxy_Broker; + + class TAO_PortableServer_Export ServerObject : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -136,12 +150,12 @@ class TAO_PortableServer_Export ServerObject : public virtual ACE_CORBA_1 (Objec static ServerObject_ptr _duplicate (ServerObject_ptr obj); static ServerObject_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServerObject_ptr _nil (void) @@ -169,98 +183,266 @@ class TAO_PortableServer_Export ServerObject : public virtual ACE_CORBA_1 (Objec virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; + private: + _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_; + protected: - ServerObject (void); - ServerObject (TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0 - ); + ServerObject (int collocated = 0); + + protected: + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated); + + ServerObject ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_ServerObject_Remote_Proxy_Impl; + friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; + friend class _TAO_ServerObject_Direct_Proxy_Impl; + virtual ~ServerObject (void); private: ServerObject (const ServerObject &); void operator= (const ServerObject &); -}; -class TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory -{ -public: +#if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts + // and build the lists dynamically on demand so that unnecessary time overhead + // of building these lists when they arent used is avoided. + class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::ServerObject; - TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (int register_proxy_factory = 1); + friend class _TAO_ServerObject_Remote_Proxy_Impl; + friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; + friend class _TAO_ServerObject_Direct_Proxy_Impl; - virtual ~TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (void); + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - virtual ServerObject_ptr create_proxy ( - ServerObject_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); -}; + virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); -class TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter -{ -public: + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - friend class TAO_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - int register_proxy_factory ( - TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *df, - CORBA::Environment &env = - TAO_default_environment () - ); + private: + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &); + + }; - int unregister_proxy_factory ( - CORBA::Environment &env = + class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::ServerObject; + + friend class _TAO_ServerObject_Remote_Proxy_Impl; + friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; + friend class _TAO_ServerObject_Direct_Proxy_Impl; + + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - ServerObject_ptr create_proxy ( - ServerObject_ptr proxy, - CORBA::Environment &env = + virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); -protected: - TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter (void); - ~TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter (void); - TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter &operator= ( - const TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter & - ); - TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *proxy_factory_; - int delete_proxy_factory_; - TAO_SYNCH_RECURSIVE_MUTEX lock_; - }; + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - typedef TAO_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER; - class TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base : public virtual ACE_NESTED_CLASS (ImplementationRepository, ServerObject) - { - public: - TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (::ImplementationRepository::ServerObject_ptr proxy); - ~TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (void); - virtual void ping ( + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &); + +}; + +#endif /* TAO_HAS_INTERCEPTORS */ + +}; + + +// The Proxy Implementations are used by each interface to +// perform a call. Each different implementation encapsulate +// an invocation logics. + + +/////////////////////////////////////////////////////////////////////// +// Base Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl +{ +public: + virtual ~_TAO_ServerObject_Proxy_Impl (void) { } + + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void shutdown ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + +protected: + _TAO_ServerObject_Proxy_Impl (void); + +}; +// +// Base Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : + public virtual _TAO_ServerObject_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl +{ +public: + _TAO_ServerObject_Remote_Proxy_Impl (void); + + virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { } + + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void shutdown ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); +}; + +// +// Base Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +// The Proxy Brokers are used by each interface to get +// the right proxy for performing a call. In the new +// collocation scheme, the proxy to be used can vary on +// a call by call basis. + + + +/////////////////////////////////////////////////////////////////////// +// Base Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker +{ +public: + virtual ~_TAO_ServerObject_Proxy_Broker (void); + virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( + ServerObject *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ) = 0; + +protected: + _TAO_ServerObject_Proxy_Broker (void); + +}; + +// +// End Base Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker : public virtual _TAO_ServerObject_Proxy_Broker +{ +public: + _TAO_ServerObject_Remote_Proxy_Broker (void); + + virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void); + + virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( + ServerObject *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); + private: - ::ImplementationRepository::ServerObject_var base_proxy_; + _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_; +// This member function is used to get an handle to the unique instance +// of the Remote Proxy Broker that is available for a given +// interface. + +public: + static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void); }; +// +// End Remote Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject; @@ -402,7 +584,7 @@ public: CORBA::ULong max, CORBA::ULong length, EnvironmentVariable *buffer, - CORBA::Boolean release=0 + CORBA::Boolean release = 0 ); EnvironmentList (const EnvironmentList &); // copy ctor ~EnvironmentList (void); @@ -442,7 +624,9 @@ public: operator EnvironmentList &() const; operator EnvironmentList *&(); // variable-size base types only - EnvironmentVariable &operator[] (CORBA::ULong index); + EnvironmentVariable & operator[] (CORBA::ULong index); + const EnvironmentVariable & operator[] (CORBA::ULong index) const; + // in, inout, out, _retn const EnvironmentList &in (void) const; EnvironmentList &inout (void); @@ -472,7 +656,7 @@ public: operator EnvironmentList *&(); EnvironmentList *&ptr (void); EnvironmentList *operator-> (void); - EnvironmentVariable &operator[] (CORBA::ULong index); + EnvironmentVariable & operator[] (CORBA::ULong index); private: EnvironmentList *&ptr_; @@ -696,7 +880,7 @@ public: CORBA::ULong max, CORBA::ULong length, ServerInformation *buffer, - CORBA::Boolean release=0 + CORBA::Boolean release = 0 ); ServerInformationList (const ServerInformationList &); // copy ctor ~ServerInformationList (void); @@ -736,7 +920,9 @@ public: operator ServerInformationList &() const; operator ServerInformationList *&(); // variable-size base types only - ServerInformation &operator[] (CORBA::ULong index); + ServerInformation & operator[] (CORBA::ULong index); + const ServerInformation & operator[] (CORBA::ULong index) const; + // in, inout, out, _retn const ServerInformationList &in (void) const; ServerInformationList &inout (void); @@ -766,7 +952,7 @@ public: operator ServerInformationList *&(); ServerInformationList *&ptr (void); ServerInformationList *operator-> (void); - ServerInformation &operator[] (CORBA::ULong index); + ServerInformation & operator[] (CORBA::ULong index); private: ServerInformationList *&ptr_; @@ -796,7 +982,7 @@ class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_ { public: ServerInformationIterator_var (void); // default constructor - ServerInformationIterator_var (ServerInformationIterator_ptr); + ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor ~ServerInformationIterator_var (void); // destructor @@ -864,7 +1050,7 @@ class TAO_PortableServer_Export Administration_var : public TAO_Base_var { public: Administration_var (void); // default constructor - Administration_var (Administration_ptr); + Administration_var (Administration_ptr p) : ptr_ (p) {} Administration_var (const Administration_var &); // copy constructor ~Administration_var (void); // destructor @@ -919,7 +1105,13 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_ -class TAO_PortableServer_Export Administration : public virtual ACE_CORBA_1 (Object) +// Forward Classes Declaration +class _TAO_Administration_Proxy_Impl; +class _TAO_Administration_Remote_Proxy_Impl; +class _TAO_Administration_Proxy_Broker; +class _TAO_Administration_Remote_Proxy_Broker; + +class TAO_PortableServer_Export Administration : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -931,12 +1123,12 @@ public: static Administration_ptr _duplicate (Administration_ptr obj); static Administration_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static Administration_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static Administration_ptr _nil (void) @@ -946,6 +1138,7 @@ public: static void _tao_any_destructor (void*); + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_ @@ -953,78 +1146,95 @@ public: { public: - AlreadyRegistered (void); // default ctor - AlreadyRegistered (const AlreadyRegistered &); // copy ctor + AlreadyRegistered (void); + // Default constructor. + + AlreadyRegistered (const AlreadyRegistered &); + // Copy constructor. + ~AlreadyRegistered (void); + // Destructor. + static void _tao_any_destructor (void*); - AlreadyRegistered &operator= (const AlreadyRegistered &); + AlreadyRegistered &operator= (const AlreadyRegistered &); virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, - CORBA::Environment &) const; + CORBA::Environment & + ) const; + virtual void _tao_decode ( TAO_InputCDR &, - CORBA::Environment &); + CORBA::Environment & + ); static AlreadyRegistered *_downcast (CORBA::Exception *); - // = TAO extension + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception ImplementationRepository::Administration::AlreadyRegistered. - }; // exception ImplementationRepository::Administration::AlreadyRegistered - - static CORBA::TypeCode_ptr _tc_AlreadyRegistered; + static CORBA::TypeCode_ptr _tc_AlreadyRegistered; #endif /* end #if !defined */ + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_ class TAO_PortableServer_Export CannotActivate : public CORBA::UserException { public: - TAO_String_Manager reason; - CannotActivate (void); // default ctor - CannotActivate (const CannotActivate &); // copy ctor + CannotActivate (void); + // Default constructor. + + CannotActivate (const CannotActivate &); + // Copy constructor. + ~CannotActivate (void); + // Destructor. + static void _tao_any_destructor (void*); - CannotActivate &operator= (const CannotActivate &); + CannotActivate &operator= (const CannotActivate &); virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, - CORBA::Environment &) const; + CORBA::Environment & + ) const; + virtual void _tao_decode ( TAO_InputCDR &, - CORBA::Environment &); + CORBA::Environment & + ); static CannotActivate *_downcast (CORBA::Exception *); CannotActivate ( - const char * _tao_reason - ); + const char * _tao_reason + ); - // = TAO extension + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception ImplementationRepository::Administration::CannotActivate. - }; // exception ImplementationRepository::Administration::CannotActivate - - static CORBA::TypeCode_ptr _tc_CannotActivate; + static CORBA::TypeCode_ptr _tc_CannotActivate; #endif /* end #if !defined */ + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_ @@ -1032,32 +1242,40 @@ public: { public: - NotFound (void); // default ctor - NotFound (const NotFound &); // copy ctor + NotFound (void); + // Default constructor. + + NotFound (const NotFound &); + // Copy constructor. + ~NotFound (void); + // Destructor. + static void _tao_any_destructor (void*); - NotFound &operator= (const NotFound &); + NotFound &operator= (const NotFound &); virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, - CORBA::Environment &) const; + CORBA::Environment & + ) const; + virtual void _tao_decode ( TAO_InputCDR &, - CORBA::Environment &); + CORBA::Environment & + ); static NotFound *_downcast (CORBA::Exception *); - // = TAO extension + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception ImplementationRepository::Administration::NotFound. - }; // exception ImplementationRepository::Administration::NotFound - - static CORBA::TypeCode_ptr _tc_NotFound; + static CORBA::TypeCode_ptr _tc_NotFound; #endif /* end #if !defined */ @@ -1160,81 +1378,575 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; +private: + _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_; + protected: - Administration (void); - Administration (TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0 - ); + Administration (int collocated = 0); + + protected: + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_Administration_setup_collocation (int collocated); + + Administration ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + virtual ~Administration (void); private: Administration (const Administration &); void operator= (const Administration &); + +#if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts + // and build the lists dynamically on demand so that unnecessary time overhead + // of building these lists when they arent used is avoided. + class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + + TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &); + const char * server_; + }; -class TAO_ImplementationRepository_Administration_Default_Proxy_Factory +class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo { public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - TAO_ImplementationRepository_Administration_Default_Proxy_Factory (int register_proxy_factory = 1); +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual ~TAO_ImplementationRepository_Administration_Default_Proxy_Factory (void); +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &); + const char * server_; + const ImplementationRepository::StartupOptions & options_; - virtual Administration_ptr create_proxy ( - Administration_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); }; -class TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter +class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo { public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - friend class TAO_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - int register_proxy_factory ( - TAO_ImplementationRepository_Administration_Default_Proxy_Factory *df, - CORBA::Environment &env = - TAO_default_environment () - ); +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - int unregister_proxy_factory ( - CORBA::Environment &env = - TAO_default_environment () - ); +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - Administration_ptr create_proxy ( - Administration_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &); + const char * server_; + const ImplementationRepository::StartupOptions & options_; + +}; + +class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo +{ +public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &); + const char * server_; + +}; + +class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo +{ +public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &); + const char * server_; + +}; + +class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo +{ +public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &); + const char * server_; + const char * addr_; + ImplementationRepository::ServerObject_ptr server_object_; + void result (char * result); + // update the result + char * _result; +}; + +class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ClientRequestInfo +{ +public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); + const char * server_; + +}; + +class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo +{ +public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_find ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &); + const char * server_; + +}; + +class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo +{ +public: + friend class ImplementationRepository::Administration; + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + +TAO_ClientRequestInfo_ImplementationRepository_Administration_list ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const CORBA::ULong & how_many +, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &); + const CORBA::ULong & how_many_; + + +}; + +#endif /* TAO_HAS_INTERCEPTORS */ + +}; + + +// The Proxy Implementations are used by each interface to +// perform a call. Each different implementation encapsulate +// an invocation logics. + + +/////////////////////////////////////////////////////////////////////// +// Base Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl : public virtual TAO_Object_Proxy_Impl +{ +public: + virtual ~_TAO_Administration_Proxy_Impl (void) { } + + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )) = 0; + + virtual void register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )) = 0; + + virtual void reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual char * server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; protected: - TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter (void); - ~TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter (void); - TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter &operator= ( - const TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter & - ); - TAO_ImplementationRepository_Administration_Default_Proxy_Factory *proxy_factory_; - int delete_proxy_factory_; - TAO_SYNCH_RECURSIVE_MUTEX lock_; - }; + _TAO_Administration_Proxy_Impl (void); - typedef TAO_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER; - class TAO_ImplementationRepository_Administration_Smart_Proxy_Base : public virtual ACE_NESTED_CLASS (ImplementationRepository, Administration) - { - public: - TAO_ImplementationRepository_Administration_Smart_Proxy_Base (::ImplementationRepository::Administration_ptr proxy); - ~TAO_ImplementationRepository_Administration_Smart_Proxy_Base (void); - virtual void activate_server ( +}; +// +// Base Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl : + public virtual _TAO_Administration_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl +{ +public: + _TAO_Administration_Remote_Proxy_Impl (void); + + virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { } + + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1243,10 +1955,10 @@ protected: )); virtual void register_server ( + CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1254,19 +1966,19 @@ protected: )); virtual void reregister_server ( + CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_server ( + CORBA_Object *_collocated_tao_target_, const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1274,9 +1986,9 @@ protected: )); virtual void shutdown_server ( + CORBA_Object *_collocated_tao_target_, const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1284,11 +1996,11 @@ protected: )); virtual char * server_is_running ( + CORBA_Object *_collocated_tao_target_, const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1296,9 +2008,9 @@ protected: )); virtual void server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1306,10 +2018,10 @@ protected: )); virtual void find ( + CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1317,21 +2029,85 @@ protected: )); virtual void list ( + CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); +}; + +// +// Base Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +// The Proxy Brokers are used by each interface to get +// the right proxy for performing a call. In the new +// collocation scheme, the proxy to be used can vary on +// a call by call basis. + + + +/////////////////////////////////////////////////////////////////////// +// Base Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker +{ +public: + virtual ~_TAO_Administration_Proxy_Broker (void); + virtual _TAO_Administration_Proxy_Impl &select_proxy ( + Administration *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ) = 0; + +protected: + _TAO_Administration_Proxy_Broker (void); + +}; + +// +// End Base Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker : public virtual _TAO_Administration_Proxy_Broker +{ +public: + _TAO_Administration_Remote_Proxy_Broker (void); + + virtual ~_TAO_Administration_Remote_Proxy_Broker (void); + + virtual _TAO_Administration_Proxy_Impl &select_proxy ( + Administration *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); + private: - ::ImplementationRepository::Administration_var base_proxy_; + _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_; +// This member function is used to get an handle to the unique instance +// of the Remote Proxy Broker that is available for a given +// interface. + +public: + static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void); }; +// +// End Remote Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration; @@ -1353,7 +2129,7 @@ class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_ { public: ServerInformationIterator_var (void); // default constructor - ServerInformationIterator_var (ServerInformationIterator_ptr); + ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor ~ServerInformationIterator_var (void); // destructor @@ -1408,7 +2184,13 @@ private: #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_ -class TAO_PortableServer_Export ServerInformationIterator : public virtual ACE_CORBA_1 (Object) +// Forward Classes Declaration +class _TAO_ServerInformationIterator_Proxy_Impl; +class _TAO_ServerInformationIterator_Remote_Proxy_Impl; +class _TAO_ServerInformationIterator_Proxy_Broker; +class _TAO_ServerInformationIterator_Remote_Proxy_Broker; + +class TAO_PortableServer_Export ServerInformationIterator : public virtual CORBA_Object { public: #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) @@ -1420,12 +2202,12 @@ public: static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); static ServerInformationIterator_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServerInformationIterator_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ServerInformationIterator_ptr _nil (void) @@ -1455,100 +2237,274 @@ public: virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); + virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual const char* _interface_repository_id (void) const; +private: + _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_; + protected: - ServerInformationIterator (void); - ServerInformationIterator (TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0 - ); + ServerInformationIterator (int collocated = 0); + + protected: + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated); + + ServerInformationIterator ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; + virtual ~ServerInformationIterator (void); private: ServerInformationIterator (const ServerInformationIterator &); void operator= (const ServerInformationIterator &); + +#if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts + // and build the lists dynamically on demand so that unnecessary time overhead + // of building these lists when they arent used is avoided. + class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::ServerInformationIterator; + + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; + + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const CORBA::ULong & how_many, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + const CORBA::ULong & how_many_; + void result (CORBA::Boolean result); + // update the result + CORBA::Boolean _result; }; -class TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory +class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ClientRequestInfo { public: + friend class ImplementationRepository::ServerInformationIterator; - TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (int register_proxy_factory = 1); + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; - virtual ~TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (void); +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); - virtual ServerInformationIterator_ptr create_proxy ( - ServerInformationIterator_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); }; -class TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter +#endif /* TAO_HAS_INTERCEPTORS */ + +}; + + +// The Proxy Implementations are used by each interface to +// perform a call. Each different implementation encapsulate +// an invocation logics. + + +/////////////////////////////////////////////////////////////////////// +// Base Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl : public virtual TAO_Object_Proxy_Impl { public: + virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { } - friend class TAO_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; - int register_proxy_factory ( - TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *df, - CORBA::Environment &env = - TAO_default_environment () - ); + virtual void destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; - int unregister_proxy_factory ( - CORBA::Environment &env = - TAO_default_environment () - ); +protected: + _TAO_ServerInformationIterator_Proxy_Impl (void); - ServerInformationIterator_ptr create_proxy ( - ServerInformationIterator_ptr proxy, - CORBA::Environment &env = - TAO_default_environment () - ); +}; +// +// Base Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// -protected: - TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter (void); - ~TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter (void); - TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter &operator= ( - const TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter & - ); - TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *proxy_factory_; - int delete_proxy_factory_; - TAO_SYNCH_RECURSIVE_MUTEX lock_; - }; - typedef TAO_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER; - class TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base : public virtual ACE_NESTED_CLASS (ImplementationRepository, ServerInformationIterator) - { - public: - TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base (::ImplementationRepository::ServerInformationIterator_ptr proxy); - ~TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base (void); - virtual CORBA::Boolean next_n ( +/////////////////////////////////////////////////////////////////////// +// Remote Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl : + public virtual _TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl +{ +public: + _TAO_ServerInformationIterator_Remote_Proxy_Impl (void); + + virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { } + + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( CORBA::SystemException )); +}; + +// +// Base Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +// The Proxy Brokers are used by each interface to get +// the right proxy for performing a call. In the new +// collocation scheme, the proxy to be used can vary on +// a call by call basis. + + + +/////////////////////////////////////////////////////////////////////// +// Base Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker +{ +public: + virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void); + virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ) = 0; + +protected: + _TAO_ServerInformationIterator_Proxy_Broker (void); + +}; + +// +// End Base Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Remote Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker : public virtual _TAO_ServerInformationIterator_Proxy_Broker +{ +public: + _TAO_ServerInformationIterator_Remote_Proxy_Broker (void); + + virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); + + virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); + private: - ::ImplementationRepository::ServerInformationIterator_var base_proxy_; + _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_; +// This member function is used to get an handle to the unique instance +// of the Remote Proxy Broker that is available for a given +// interface. + +public: + static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); }; +// +// End Remote Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator; @@ -1557,9 +2513,20 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator; } TAO_NAMESPACE_CLOSE // module ImplementationRepository -extern TAO_PortableServer_Export ImplementationRepository::ServerObject_ptr (*_TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer) ( +// Proxy Broker Factory function pointer declarations. + +extern TAO_PortableServer_Export ImplementationRepository::_TAO_ServerObject_Proxy_Broker * (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); + +extern TAO_PortableServer_Export ImplementationRepository::_TAO_Administration_Proxy_Broker * (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); + +extern TAO_PortableServer_Export ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); + // Any operators for interface ImplementationRepository::ServerObject TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&); @@ -1585,9 +2552,6 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRe TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&); -extern TAO_PortableServer_Export ImplementationRepository::Administration_ptr (*_TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); // Any operators for interface ImplementationRepository::Administration TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&); @@ -1603,9 +2567,6 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRe TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&); -extern TAO_PortableServer_Export ImplementationRepository::ServerInformationIterator_ptr (*_TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); // Any operators for interface ImplementationRepository::ServerInformationIterator TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&); @@ -1657,27 +2618,12 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &); -# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::AlreadyRegistered &); - -# endif /* ACE_LACKS_IOSTREAM_TOTALLY */ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &); -# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::CannotActivate &); - -# endif /* ACE_LACKS_IOSTREAM_TOTALLY */ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &); -# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -TAO_PortableServer_Export ostream& operator<< (ostream &, const ImplementationRepository::Administration::NotFound &); - -# endif /* ACE_LACKS_IOSTREAM_TOTALLY */ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr ); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &); @@ -1692,5 +2638,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat #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/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i index cc431bdec0f..50b7f7a028c 100644 --- a/TAO/tao/PortableServer/ImplRepoC.i +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -1,24 +1,40 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -ACE_INLINE -ImplementationRepository::ServerObject::ServerObject (void) // default constructor -{} -ACE_INLINE -ImplementationRepository::ServerObject::ServerObject (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_collocated) -{} +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_) +#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_ ACE_INLINE -ImplementationRepository::ServerObject::~ServerObject (void) // destructor -{} +ImplementationRepository::ServerObject::ServerObject ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant + ) + : CORBA_Object (objref, _tao_collocated, servant) +{ + this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated); +} + +#endif /* end #if !defined */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CI_) @@ -33,11 +49,6 @@ ImplementationRepository::ServerObject_var::ServerObject_var (void) // default c : ptr_ (ServerObject::_nil ()) {} -ACE_INLINE -ImplementationRepository::ServerObject_var::ServerObject_var (ServerObject_ptr p) - : ptr_ (p) -{} - ACE_INLINE ::ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject_var::ptr (void) const { @@ -244,19 +255,19 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa } else { - ImplementationRepository::EnvironmentVariable *deep_copy = - new ImplementationRepository::EnvironmentVariable (*p.ptr_); - + EnvironmentVariable *deep_copy = + new EnvironmentVariable (*p.ptr_); + if (deep_copy != 0) { - ImplementationRepository::EnvironmentVariable *tmp = deep_copy; + EnvironmentVariable *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; } } } - + return *this; } @@ -605,8 +616,8 @@ ImplementationRepository::EnvironmentList_var::operator= (EnvironmentList *p) return *this; } -ACE_INLINE ImplementationRepository::EnvironmentList_var & -ImplementationRepository::EnvironmentList_var::operator= (const ::ImplementationRepository::EnvironmentList_var &p) // deep copy +ACE_INLINE ::ImplementationRepository::EnvironmentList_var & +ImplementationRepository::EnvironmentList_var::operator= (const ::ImplementationRepository::EnvironmentList_var &p) { if (this != &p) { @@ -617,19 +628,19 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation } else { - ImplementationRepository::EnvironmentList *deep_copy = - new ImplementationRepository::EnvironmentList (*p.ptr_); - + EnvironmentList *deep_copy = + new EnvironmentList (*p.ptr_); + if (deep_copy != 0) { - ImplementationRepository::EnvironmentList *tmp = deep_copy; + EnvironmentList *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; } } } - + return *this; } @@ -676,6 +687,12 @@ ImplementationRepository::EnvironmentList_var::operator[] (CORBA::ULong index) return this->ptr_->operator[] (index); } +ACE_INLINE const ImplementationRepository::EnvironmentVariable & +ImplementationRepository::EnvironmentList_var::operator[] (CORBA::ULong index) const +{ + return ACE_const_cast (const ImplementationRepository::EnvironmentVariable &, this->ptr_->operator[] (index)); +} + ACE_INLINE const ::ImplementationRepository::EnvironmentList & ImplementationRepository::EnvironmentList_var::in (void) const { @@ -825,19 +842,19 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR } else { - ImplementationRepository::StartupOptions *deep_copy = - new ImplementationRepository::StartupOptions (*p.ptr_); - + StartupOptions *deep_copy = + new StartupOptions (*p.ptr_); + if (deep_copy != 0) { - ImplementationRepository::StartupOptions *tmp = deep_copy; + StartupOptions *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; } } } - + return *this; } @@ -1018,19 +1035,19 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati } else { - ImplementationRepository::ServerInformation *deep_copy = - new ImplementationRepository::ServerInformation (*p.ptr_); - + ServerInformation *deep_copy = + new ServerInformation (*p.ptr_); + if (deep_copy != 0) { - ImplementationRepository::ServerInformation *tmp = deep_copy; + ServerInformation *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; } } } - + return *this; } @@ -1379,8 +1396,8 @@ ImplementationRepository::ServerInformationList_var::operator= (ServerInformatio return *this; } -ACE_INLINE ImplementationRepository::ServerInformationList_var & -ImplementationRepository::ServerInformationList_var::operator= (const ::ImplementationRepository::ServerInformationList_var &p) // deep copy +ACE_INLINE ::ImplementationRepository::ServerInformationList_var & +ImplementationRepository::ServerInformationList_var::operator= (const ::ImplementationRepository::ServerInformationList_var &p) { if (this != &p) { @@ -1391,19 +1408,19 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen } else { - ImplementationRepository::ServerInformationList *deep_copy = - new ImplementationRepository::ServerInformationList (*p.ptr_); - + ServerInformationList *deep_copy = + new ServerInformationList (*p.ptr_); + if (deep_copy != 0) { - ImplementationRepository::ServerInformationList *tmp = deep_copy; + ServerInformationList *tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; } } } - + return *this; } @@ -1450,6 +1467,12 @@ ImplementationRepository::ServerInformationList_var::operator[] (CORBA::ULong in return this->ptr_->operator[] (index); } +ACE_INLINE const ImplementationRepository::ServerInformation & +ImplementationRepository::ServerInformationList_var::operator[] (CORBA::ULong index) const +{ + return ACE_const_cast (const ImplementationRepository::ServerInformation &, this->ptr_->operator[] (index)); +} + ACE_INLINE const ::ImplementationRepository::ServerInformationList & ImplementationRepository::ServerInformationList_var::in (void) const { @@ -1550,118 +1573,118 @@ ImplementationRepository::ServerInformationList_out::operator[] (CORBA::ULong in #endif /* end #if !defined */ -ACE_INLINE -ImplementationRepository::Administration::Administration (void) // default constructor -{} -ACE_INLINE -ImplementationRepository::Administration::Administration (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_collocated) -{} +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_ ACE_INLINE -ImplementationRepository::Administration::~Administration (void) // destructor -{} +ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant + ) + : CORBA_Object (objref, _tao_collocated, servant) +{ + this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated); +} -#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CI_) -#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CI_ +#endif /* end #if !defined */ + + +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CI_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CI_ // ************************************************************* -// Inline operations for class ImplementationRepository::Administration_var +// Inline operations for class ImplementationRepository::ServerInformationIterator_var // ************************************************************* ACE_INLINE -ImplementationRepository::Administration_var::Administration_var (void) // default constructor - : ptr_ (Administration::_nil ()) -{} - -ACE_INLINE -ImplementationRepository::Administration_var::Administration_var (Administration_ptr p) - : ptr_ (p) +ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void) // default constructor + : ptr_ (ImplementationRepository::ServerInformationIterator::_nil ()) {} -ACE_INLINE ::ImplementationRepository::Administration_ptr -ImplementationRepository::Administration_var::ptr (void) const +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator_var::ptr (void) const { return this->ptr_; } ACE_INLINE -ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p) // copy constructor +ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ImplementationRepository::ServerInformationIterator_var &p) // copy constructor : TAO_Base_var (), - ptr_ (Administration::_duplicate (p.ptr ())) + ptr_ (ServerInformationIterator::_duplicate (p.ptr ())) {} ACE_INLINE -ImplementationRepository::Administration_var::~Administration_var (void) // destructor +ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void) // destructor { CORBA::release (this->ptr_); } -ACE_INLINE ImplementationRepository::Administration_var & -ImplementationRepository::Administration_var::operator= (Administration_ptr p) +ACE_INLINE ImplementationRepository::ServerInformationIterator_var & +ImplementationRepository::ServerInformationIterator_var::operator= (ImplementationRepository::ServerInformationIterator_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -ACE_INLINE ImplementationRepository::Administration_var & -ImplementationRepository::Administration_var::operator= (const ::ImplementationRepository::Administration_var &p) +ACE_INLINE ImplementationRepository::ServerInformationIterator_var & +ImplementationRepository::ServerInformationIterator_var::operator= (const ImplementationRepository::ServerInformationIterator_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ()); + this->ptr_ = ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast +ImplementationRepository::ServerInformationIterator_var::operator const ImplementationRepository::ServerInformationIterator_ptr &() const // cast { return this->ptr_; } ACE_INLINE -ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast +ImplementationRepository::ServerInformationIterator_var::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr -ImplementationRepository::Administration_var::operator-> (void) const +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr -ImplementationRepository::Administration_var::in (void) const +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator_var::in (void) const { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr & -ImplementationRepository::Administration_var::inout (void) +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr & +ImplementationRepository::ServerInformationIterator_var::inout (void) { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr & -ImplementationRepository::Administration_var::out (void) +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr & +ImplementationRepository::ServerInformationIterator_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::ImplementationRepository::Administration::_nil (); + this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil (); return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr -ImplementationRepository::Administration_var::_retn (void) +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator_var::_retn (void) { // yield ownership of managed obj reference - ::ImplementationRepository::Administration_ptr val = this->ptr_; - this->ptr_ = ::ImplementationRepository::Administration::_nil (); + ImplementationRepository::ServerInformationIterator_ptr val = this->ptr_; + this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil (); return val; } @@ -1669,68 +1692,68 @@ ImplementationRepository::Administration_var::_retn (void) #endif /* end #if !defined */ -#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CI_) -#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CI_ +#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CI_) +#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CI_ // ************************************************************* -// Inline operations for class ImplementationRepository::Administration_out +// Inline operations for class ImplementationRepository::ServerInformationIterator_out // ************************************************************* ACE_INLINE -ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p) +ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ImplementationRepository::ServerInformationIterator_ptr &p) : ptr_ (p) { - this->ptr_ = ::ImplementationRepository::Administration::_nil (); + this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil (); } ACE_INLINE -ImplementationRepository::Administration_out::Administration_out (Administration_var &p) // constructor from _var +ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ImplementationRepository::ServerInformationIterator_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::ImplementationRepository::Administration::_nil (); + this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil (); } ACE_INLINE -ImplementationRepository::Administration_out::Administration_out (const ::ImplementationRepository::Administration_out &p) // copy constructor - : ptr_ (ACE_const_cast (Administration_out &, p).ptr_) +ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (const ImplementationRepository::ServerInformationIterator_out &p) // copy constructor + : ptr_ (ACE_const_cast (ImplementationRepository::ServerInformationIterator_out&,p).ptr_) {} -ACE_INLINE ::ImplementationRepository::Administration_out & -ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_out &p) +ACE_INLINE ImplementationRepository::ServerInformationIterator_out & +ImplementationRepository::ServerInformationIterator_out::operator= (const ImplementationRepository::ServerInformationIterator_out &p) { - this->ptr_ = ACE_const_cast (Administration_out&, p).ptr_; + this->ptr_ = ACE_const_cast (ImplementationRepository::ServerInformationIterator_out&,p).ptr_; return *this; } -ACE_INLINE ImplementationRepository::Administration_out & -ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_var &p) +ACE_INLINE ImplementationRepository::ServerInformationIterator_out & +ImplementationRepository::ServerInformationIterator_out::operator= (const ImplementationRepository::ServerInformationIterator_var &p) { - this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ()); + this->ptr_ = ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ()); return *this; } -ACE_INLINE ImplementationRepository::Administration_out & -ImplementationRepository::Administration_out::operator= (Administration_ptr p) +ACE_INLINE ImplementationRepository::ServerInformationIterator_out & +ImplementationRepository::ServerInformationIterator_out::operator= (ImplementationRepository::ServerInformationIterator_ptr p) { this->ptr_ = p; return *this; } ACE_INLINE -ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast +ImplementationRepository::ServerInformationIterator_out::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr & -ImplementationRepository::Administration_out::ptr (void) // ptr +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr & +ImplementationRepository::ServerInformationIterator_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::Administration_ptr -ImplementationRepository::Administration_out::operator-> (void) +ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator_out::operator-> (void) { return this->ptr_; } @@ -1750,118 +1773,117 @@ ImplementationRepository::Administration_out::operator-> (void) // Inline operations for exception ImplementationRepository::Administration::NotFound // ************************************************************* -ACE_INLINE -ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void) // default constructor -{} -ACE_INLINE -ImplementationRepository::ServerInformationIterator::ServerInformationIterator (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor - : CORBA_Object (objref, _tao_collocated) -{} +#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_) +#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_ ACE_INLINE -ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void) // destructor -{} +ImplementationRepository::Administration::Administration ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated, + TAO_Abstract_ServantBase *servant + ) + : CORBA_Object (objref, _tao_collocated, servant) +{ + this->ImplementationRepository_Administration_setup_collocation (_tao_collocated); +} +#endif /* end #if !defined */ -#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CI_) -#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CI_ + +#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CI_) +#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CI_ // ************************************************************* -// Inline operations for class ImplementationRepository::ServerInformationIterator_var +// Inline operations for class ImplementationRepository::Administration_var // ************************************************************* ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void) // default constructor - : ptr_ (ServerInformationIterator::_nil ()) -{} - -ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (ServerInformationIterator_ptr p) - : ptr_ (p) +ImplementationRepository::Administration_var::Administration_var (void) // default constructor + : ptr_ (Administration::_nil ()) {} -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::ServerInformationIterator_var::ptr (void) const +ACE_INLINE ::ImplementationRepository::Administration_ptr +ImplementationRepository::Administration_var::ptr (void) const { return this->ptr_; } ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ::ImplementationRepository::ServerInformationIterator_var &p) // copy constructor +ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p) // copy constructor : TAO_Base_var (), - ptr_ (ServerInformationIterator::_duplicate (p.ptr ())) + ptr_ (Administration::_duplicate (p.ptr ())) {} ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void) // destructor +ImplementationRepository::Administration_var::~Administration_var (void) // destructor { CORBA::release (this->ptr_); } -ACE_INLINE ImplementationRepository::ServerInformationIterator_var & -ImplementationRepository::ServerInformationIterator_var::operator= (ServerInformationIterator_ptr p) +ACE_INLINE ImplementationRepository::Administration_var & +ImplementationRepository::Administration_var::operator= (Administration_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -ACE_INLINE ImplementationRepository::ServerInformationIterator_var & -ImplementationRepository::ServerInformationIterator_var::operator= (const ::ImplementationRepository::ServerInformationIterator_var &p) +ACE_INLINE ImplementationRepository::Administration_var & +ImplementationRepository::Administration_var::operator= (const ::ImplementationRepository::Administration_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ()); + this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::operator const ::ImplementationRepository::ServerInformationIterator_ptr &() const // cast +ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast { return this->ptr_; } ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast +ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::ServerInformationIterator_var::operator-> (void) const +ACE_INLINE ::ImplementationRepository::Administration_ptr +ImplementationRepository::Administration_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::ServerInformationIterator_var::in (void) const +ACE_INLINE ::ImplementationRepository::Administration_ptr +ImplementationRepository::Administration_var::in (void) const { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr & -ImplementationRepository::ServerInformationIterator_var::inout (void) +ACE_INLINE ::ImplementationRepository::Administration_ptr & +ImplementationRepository::Administration_var::inout (void) { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr & -ImplementationRepository::ServerInformationIterator_var::out (void) +ACE_INLINE ::ImplementationRepository::Administration_ptr & +ImplementationRepository::Administration_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil (); + this->ptr_ = ::ImplementationRepository::Administration::_nil (); return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::ServerInformationIterator_var::_retn (void) +ACE_INLINE ::ImplementationRepository::Administration_ptr +ImplementationRepository::Administration_var::_retn (void) { // yield ownership of managed obj reference - ::ImplementationRepository::ServerInformationIterator_ptr val = this->ptr_; - this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil (); + ::ImplementationRepository::Administration_ptr val = this->ptr_; + this->ptr_ = ::ImplementationRepository::Administration::_nil (); return val; } @@ -1869,68 +1891,68 @@ ImplementationRepository::ServerInformationIterator_var::_retn (void) #endif /* end #if !defined */ -#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CI_) -#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CI_ +#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CI_) +#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CI_ // ************************************************************* -// Inline operations for class ImplementationRepository::ServerInformationIterator_out +// Inline operations for class ImplementationRepository::Administration_out // ************************************************************* ACE_INLINE -ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_ptr &p) +ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p) : ptr_ (p) { - this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil (); + this->ptr_ = ::ImplementationRepository::Administration::_nil (); } ACE_INLINE -ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_var &p) // constructor from _var +ImplementationRepository::Administration_out::Administration_out (Administration_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil (); + this->ptr_ = ::ImplementationRepository::Administration::_nil (); } ACE_INLINE -ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (const ::ImplementationRepository::ServerInformationIterator_out &p) // copy constructor - : ptr_ (ACE_const_cast (ServerInformationIterator_out &, p).ptr_) +ImplementationRepository::Administration_out::Administration_out (const ::ImplementationRepository::Administration_out &p) // copy constructor + : ptr_ (ACE_const_cast (Administration_out &, p).ptr_) {} -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_out & -ImplementationRepository::ServerInformationIterator_out::operator= (const ::ImplementationRepository::ServerInformationIterator_out &p) +ACE_INLINE ::ImplementationRepository::Administration_out & +ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_out &p) { - this->ptr_ = ACE_const_cast (ServerInformationIterator_out&, p).ptr_; + this->ptr_ = ACE_const_cast (Administration_out&, p).ptr_; return *this; } -ACE_INLINE ImplementationRepository::ServerInformationIterator_out & -ImplementationRepository::ServerInformationIterator_out::operator= (const ::ImplementationRepository::ServerInformationIterator_var &p) +ACE_INLINE ImplementationRepository::Administration_out & +ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_var &p) { - this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ()); + this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ()); return *this; } -ACE_INLINE ImplementationRepository::ServerInformationIterator_out & -ImplementationRepository::ServerInformationIterator_out::operator= (ServerInformationIterator_ptr p) +ACE_INLINE ImplementationRepository::Administration_out & +ImplementationRepository::Administration_out::operator= (Administration_ptr p) { this->ptr_ = p; return *this; } ACE_INLINE -ImplementationRepository::ServerInformationIterator_out::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast +ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr & -ImplementationRepository::ServerInformationIterator_out::ptr (void) // ptr +ACE_INLINE ::ImplementationRepository::Administration_ptr & +ImplementationRepository::Administration_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE ::ImplementationRepository::ServerInformationIterator_ptr -ImplementationRepository::ServerInformationIterator_out::operator-> (void) +ACE_INLINE ::ImplementationRepository::Administration_ptr +ImplementationRepository::Administration_out::operator-> (void) { return this->ptr_; } @@ -2151,26 +2173,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::A return 1; } -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -ACE_INLINE -ostream & operator<< (ostream &os, const ImplementationRepository::Administration::AlreadyRegistered &_tao_aggregate) -{ - CORBA::TypeCode_ptr tc = _tao_aggregate._type (); - if (tc) - { - os << tc->name () << " ("; - } - os << _tao_aggregate._id (); - if (tc) - { - os << ")"; - } - return os; -} - -#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::CannotActivate &_tao_aggregate) { // first marshal the repository ID @@ -2199,26 +2201,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,ImplementationRepositor return 0; } -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -ACE_INLINE -ostream & operator<< (ostream &os, const ImplementationRepository::Administration::CannotActivate &_tao_aggregate) -{ - CORBA::TypeCode_ptr tc = _tao_aggregate._type (); - if (tc) - { - os << tc->name () << " ("; - } - os << _tao_aggregate._id (); - if (tc) - { - os << ")"; - } - return os; -} - -#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::NotFound &_tao_aggregate) { // first marshal the repository ID @@ -2233,26 +2215,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::A return 1; } -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - -ACE_INLINE -ostream & operator<< (ostream &os, const ImplementationRepository::Administration::NotFound &_tao_aggregate) -{ - CORBA::TypeCode_ptr tc = _tao_aggregate._type (); - if (tc) - { - os << tc->name () << " ("; - } - os << _tao_aggregate._id (); - if (tc) - { - os << ")"; - } - return os; -} - -#endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - ACE_INLINE CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp index 78f31f56a83..d790fced7bf 100644 --- a/TAO/tao/PortableServer/ImplRepoS.cpp +++ b/TAO/tao/PortableServer/ImplRepoS.cpp @@ -1,18 +1,44 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_ +#define _TAO_IDL_ORIG_IMPLREPOS_CPP_ #include "ImplRepoS.h" -#include "Operation_Table.h" -#include "Object_Adapter.h" -#include "tao/Stub.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Operation_Table.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" +#include "tao/Stub.h" +#include "tao/IFR_Client_Adapter.h" +#include "tao/PortableInterceptor.h" +#include "ace/Dynamic_Service.h" + +#if TAO_HAS_INTERCEPTORS == 1 +#include "tao/RequestInfo_Util.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus +#endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "ImplRepoS.i" @@ -25,9 +51,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 12:16:37 */ +/* starting time is 16:33:09 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /home/coryan/subsets/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -47,7 +73,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, - 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, + 14, 14, 14, 0, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, @@ -71,7 +97,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 0, 14, 14, - 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, + 14, 0, 14, 0, 14, 14, 14, 14, 14, 14, 0, 14, 0, 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, #endif /* ACE_MVS */ @@ -84,7 +110,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch { enum { - TOTAL_KEYWORDS = 4, + TOTAL_KEYWORDS = 5, MIN_WORD_LENGTH = 4, MAX_WORD_LENGTH = 13, MIN_HASH_VALUE = 4, @@ -100,7 +126,9 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel}, {"",0},{"",0}, {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, - {"",0},{"",0},{"",0},{"",0}, + {"",0}, + {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel}, + {"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel}, }; @@ -118,48 +146,246 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch } return 0; } -/* ending time is 12:16:37 */ +/* ending time is 16:33:09 */ static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable; -ImplementationRepository::ServerObject_ptr _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory ( - CORBA::Object_ptr obj + +/////////////////////////////////////////////////////////////////////// +// Strategized Proxy Broker Implementation +// + +// Factory function Implementation. +POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker (void) +{ + static POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker strategized_proxy_broker; + return &strategized_proxy_broker; +} + +POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::_TAO_ServerObject_Strategized_Proxy_Broker (void) +{ + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + this->proxy_cache_[i] = 0; + +} + +POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void) +{ + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + delete this->proxy_cache_[i]; + +} + +ImplementationRepository::_TAO_ServerObject_Proxy_Impl& +POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select_proxy ( + ::ImplementationRepository::ServerObject *object, + CORBA::Environment &ACE_TRY_ENV ) { - TAO_Stub *stub = obj->_stubobj (); + int strategy = + TAO_ORB_Core::collocation_strategy (object); + + if (this->proxy_cache_[strategy] != 0) + return *this->proxy_cache_[strategy]; + + this->create_proxy (strategy, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + + return *this->proxy_cache_[strategy]; + +} - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) +void +POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy ( + int strategy, + CORBA::Environment &ACE_TRY_ENV + ) +{ + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) { - case TAO_ORB_Core::THRU_POA: - { - ImplementationRepository::ServerObject_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject (stub), - 0 - ); - return retval; + switch (strategy) + { + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: + default: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + } - case TAO_ORB_Core::DIRECT: - break; - default: - break; - } - return 0; + + } } -int _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer (long dummy) + +// +// End Strategized Proxy Broker Implementation +/////////////////////////////////////////////////////////////////////// + + +ImplementationRepository::_TAO_ServerObject_Proxy_Broker * +ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) { - ACE_UNUSED_ARG (dummy); + ACE_UNUSED_ARG (obj); + return ::POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker(); +} + +int +ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long _dummy_) +{ + ACE_UNUSED_ARG (_dummy_); - _TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer = - _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory; + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function; return 0; } -static int _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer_Scarecrow = - _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer)); +static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer)); + + +/////////////////////////////////////////////////////////////////////// +// ThruPOA Proxy Implementation +// + +POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerObject_ThruPOA_Proxy_Impl (void) +{} + +// ThruPOA Implementation of the IDL interface methods +void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "ping", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerObject_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/ServerObject:1.0" + ) + )->ping ( + ACE_TRY_ENV + ); + return; +} + +void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "shutdown", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerObject_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/ServerObject:1.0" + ) + )->shutdown ( + ACE_TRY_ENV + ); + return; +} + +// +// End ThruPOA Proxy Implementation +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Direct Proxy Implementation +// + +POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void) +{} + +void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerObject_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0") + )->ping ( + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerObject_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0") + )->shutdown ( + ACE_TRY_ENV + ); + +} + + +// +// End Direct Proxy Implementation +/////////////////////////////////////////////////////////////////////// // skeleton constructor POA_ImplementationRepository::ServerObject::ServerObject (void) { @@ -181,37 +407,140 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { - POA_ImplementationRepository::ServerObject *_tao_impl = - (POA_ImplementationRepository::ServerObject *)_tao_object_reference; + POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; - _tao_impl->ping ( + _tao_server_request.argument_flag (0); + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri ( + _tao_server_request, + _tao_impl, ACE_TRY_ENV ); - ACE_CHECK; + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + + _tao_impl->ping ( + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::ServerObject::shutdown_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; + + _tao_server_request.argument_flag (0); + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( + _tao_server_request, + _tao_impl, + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + _tao_impl->shutdown ( + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::ServerObject::_is_a_skel ( TAO_ServerRequest &_tao_server_request, @@ -224,7 +553,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; CORBA::Boolean _tao_retval = 0; CORBA::String_var value; - if (!((_tao_in >> value.out ()))) + if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); @@ -232,7 +561,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } @@ -249,18 +578,69 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel ( _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } +void POA_ImplementationRepository::ServerObject::_interface_skel ( + TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) +{ + POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; + CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::Boolean _tao_result = 0; + + TAO_IFR_Client_Adapter *_tao_adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); + + if (_tao_adapter == 0) + { + ACE_THROW (CORBA::INTF_REPOS ()); + } + + ACE_TRY + { + _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + ACE_TRY_CHECK; + + _tao_server_request.init_reply (); + + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + + _tao_result = + _tao_adapter->interfacedef_cdr_insert ( + _tao_out, + _tao_retval + ); + } + ACE_CATCHALL + { + _tao_adapter->dispose (_tao_retval); + } + ACE_ENDTRY; + + if (_tao_result == 0) + { + ACE_THROW (CORBA::MARSHAL ()); + } +} + CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a ( const char* value, CORBA::Environment &ACE_TRY_ENV ) { + const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) + (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else return 0; @@ -270,9 +650,9 @@ void* POA_ImplementationRepository::ServerObject::_downcast ( const char* logical_type_id ) { -if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerObject:1.0") == 0) return ACE_static_cast (POA_ImplementationRepository::ServerObject_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); return 0; } @@ -292,152 +672,149 @@ POA_ImplementationRepository::ServerObject::_this (CORBA_Environment &ACE_TRY_EN { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); + + CORBA::Object_ptr tmp = CORBA::Object::_nil (); + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) - { - case TAO_ORB_Core::THRU_POA: - { - ::ImplementationRepository::ServerObject_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject (stub), - 0 - ); - return retval; - } - case TAO_ORB_Core::DIRECT: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - default: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - } + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else - { - // stub->_incr_refcnt (); - CORBA::Object_ptr tmp = CORBA::Object::_nil (); - ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0); - CORBA::Object_var obj = tmp; - return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ()); - } -} + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); -POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::_tao_thru_poa_collocated_ServerObject ( - TAO_Stub *stub -) - : CORBA_Object (stub, 1) -{ + CORBA::Object_var obj = tmp; + return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ()); } -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::_is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV + +#if (TAO_HAS_INTERCEPTORS == 1) +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerObject *tao_impl, + CORBA::Environment & ) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl) +{} +Dynamic::ParameterList * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_is_a", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerObject_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerObject:1.0" - ) - )->_is_a (logical_type_id, ACE_TRY_ENV); + + return parameter_list; } +Dynamic::ExceptionList * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::_non_existent( - CORBA_Environment &ACE_TRY_ENV - ) + return exception_list; +} +CORBA::Any * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_non_existent", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerObject_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerObject:1.0" - ) - )->_non_existent (ACE_TRY_ENV); + + return result_any; } +char * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} -void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::ping ( - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +CORBA::Boolean +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "ping", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerObject_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerObject:1.0" - ) - )->ping ( - ACE_TRY_ENV - ); - return; + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerObject::shutdown ( - CORBA::Environment &ACE_TRY_ENV +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerObject *tao_impl, + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "shutdown", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerObject_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerObject:1.0" - ) - )->shutdown ( - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return parameter_list; +} + +Dynamic::ExceptionList * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; } +CORBA::Any * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +char * +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} +CORBA::Boolean +POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} +#endif /* TAO_HAS_INTERCEPTORS */ class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { private: @@ -445,55 +822,55 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 12:16:37 */ +/* starting time is 16:33:09 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /home/coryan/subsets/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { static const unsigned char asso_values[] = { #if defined (ACE_MVS) - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 15, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 10, - 34, 34, 5, 34, 0, 0, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 0, 34, 5, - 34, 34, 34, 0, 34, 34, 34, 34, 34, 34, - 34, 34, 5, 0, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 0, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 4, + 29, 29, 0, 0, 0, 0, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 5, 29, 0, + 29, 29, 29, 0, 29, 29, 29, 29, 29, 29, + 29, 29, 5, 5, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, #else - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 15, 34, 10, 34, 34, - 5, 34, 0, 0, 34, 34, 34, 34, 0, 34, - 5, 34, 34, 34, 0, 5, 0, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 0, 29, 4, 29, 29, + 0, 0, 0, 0, 29, 29, 29, 29, 5, 29, + 0, 29, 29, 29, 0, 5, 5, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, #endif /* ACE_MVS */ }; return len + asso_values[str[len - 1]] + asso_values[str[0]]; @@ -504,38 +881,34 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const { enum { - TOTAL_KEYWORDS = 11, + TOTAL_KEYWORDS = 12, MIN_WORD_LENGTH = 4, MAX_WORD_LENGTH = 23, MIN_HASH_VALUE = 4, - MAX_HASH_VALUE = 33, - HASH_VALUE_RANGE = 30, + MAX_HASH_VALUE = 28, + HASH_VALUE_RANGE = 25, DUPLICATES = 0 }; static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"list", &POA_ImplementationRepository::Administration::list_skel}, - {"",0},{"",0},{"",0},{"",0}, {"find", &POA_ImplementationRepository::Administration::find_skel}, - {"",0},{"",0},{"",0}, + {"",0},{"",0},{"",0},{"",0}, + {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, + {"_interface", &POA_ImplementationRepository::Administration::_interface_skel}, + {"",0},{"",0}, {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, - {"",0}, + {"list", &POA_ImplementationRepository::Administration::list_skel}, {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, {"",0}, {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, - {"",0},{"",0}, + {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, + {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, {"",0}, {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, - {"",0},{"",0}, - {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, - {"",0},{"",0}, - {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, - {"",0}, - {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, - {"",0},{"",0}, + {"",0},{"",0},{"",0},{"",0},{"",0}, {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, }; @@ -553,48 +926,656 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const } return 0; } -/* ending time is 12:16:37 */ +/* ending time is 16:33:09 */ static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable; -ImplementationRepository::Administration_ptr _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory ( - CORBA::Object_ptr obj + +/////////////////////////////////////////////////////////////////////// +// Strategized Proxy Broker Implementation +// + +// Factory function Implementation. +POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker (void) +{ + static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker strategized_proxy_broker; + return &strategized_proxy_broker; +} + +POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO_Administration_Strategized_Proxy_Broker (void) +{ + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + this->proxy_cache_[i] = 0; + +} + +POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void) +{ + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + delete this->proxy_cache_[i]; + +} + +ImplementationRepository::_TAO_Administration_Proxy_Impl& +POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::select_proxy ( + ::ImplementationRepository::Administration *object, + CORBA::Environment &ACE_TRY_ENV ) { - TAO_Stub *stub = obj->_stubobj (); + int strategy = + TAO_ORB_Core::collocation_strategy (object); + + if (this->proxy_cache_[strategy] != 0) + return *this->proxy_cache_[strategy]; - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) + this->create_proxy (strategy, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + + return *this->proxy_cache_[strategy]; + +} + +void +POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy ( + int strategy, + CORBA::Environment &ACE_TRY_ENV + ) +{ + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) { - case TAO_ORB_Core::THRU_POA: - { - ImplementationRepository::Administration_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_ImplementationRepository::_tao_thru_poa_collocated_Administration (stub), - 0 - ); - return retval; + switch (strategy) + { + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: + default: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + } - case TAO_ORB_Core::DIRECT: - break; - default: - break; - } - return 0; + + } +} + + +// +// End Strategized Proxy Broker Implementation +/////////////////////////////////////////////////////////////////////// + + +ImplementationRepository::_TAO_Administration_Proxy_Broker * +ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) +{ + ACE_UNUSED_ARG (obj); + return ::POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker(); } -int _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer (long dummy) +int +ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long _dummy_) { - ACE_UNUSED_ARG (dummy); + ACE_UNUSED_ARG (_dummy_); - _TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer = - _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory; + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function; return 0; } -static int _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer_Scarecrow = - _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer)); +static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer)); + + +/////////////////////////////////////////////////////////////////////// +// ThruPOA Proxy Implementation +// + +POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Administration_ThruPOA_Proxy_Impl (void) +{} + +// ThruPOA Implementation of the IDL interface methods + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "activate_server", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->activate_server ( + server, + ACE_TRY_ENV + ); + return; +} + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "register_server", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->register_server ( + server, + options, + ACE_TRY_ENV + ); + return; +} +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "reregister_server", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->reregister_server ( + server, + options, + ACE_TRY_ENV + ); + return; +} + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "remove_server", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->remove_server ( + server, + ACE_TRY_ENV + ); + return; +} + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "shutdown_server", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->shutdown_server ( + server, + ACE_TRY_ENV + ); + return; +} + +char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + CORBA::String_var _tao_retval; + ACE_UNUSED_ARG (_tao_retval); + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "server_is_running", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK_RETURN (0); + return ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->server_is_running ( + server, + addr, + server_object, + ACE_TRY_ENV + ); +} + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "server_is_shutting_down", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->server_is_shutting_down ( + server, + ACE_TRY_ENV + ); + return; +} + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "find", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->find ( + server, + info, + ACE_TRY_ENV + ); + return; +} + +void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "list", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/Administration:1.0" + ) + )->list ( + how_many, + server_list, + server_iterator, + ACE_TRY_ENV + ); + return; +} + +// +// End ThruPOA Proxy Implementation +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Direct Proxy Implementation +// + +POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Administration_Direct_Proxy_Impl (void) +{} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->activate_server ( + server, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->register_server ( + server, + options, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->reregister_server ( + server, + options, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->remove_server ( + server, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->shutdown_server ( + server, + ACE_TRY_ENV + ); + +} + +char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + return ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->server_is_running ( + server, + addr, + server_object, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->server_is_shutting_down ( + server, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->find ( + server, + info, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::Administration_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") + )->list ( + how_many, + server_list, + server_iterator, + ACE_TRY_ENV + ); + +} + + +// +// End Direct Proxy Implementation +/////////////////////////////////////////////////////////////////////// // skeleton constructor POA_ImplementationRepository::Administration::Administration (void) { @@ -616,154 +1597,415 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + _tao_server_request.argument_flag (0); + CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); + + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->activate_server ( - server.in (), + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::Administration::register_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + _tao_server_request.argument_flag (0); + CORBA::String_var server; ImplementationRepository::StartupOptions options; if (!( (_tao_in >> server.out ()) && (_tao_in >> options) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + options, + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + _tao_impl->register_server ( - server.in (), - options, + server.in (), + options, + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::Administration::reregister_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + _tao_server_request.argument_flag (0); + CORBA::String_var server; ImplementationRepository::StartupOptions options; if (!( (_tao_in >> server.out ()) && (_tao_in >> options) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); + + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + options, + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->reregister_server ( - server.in (), - options, + server.in (), + options, + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::Administration::remove_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + _tao_server_request.argument_flag (0); + CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); + + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->remove_server ( - server.in (), + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::Administration::shutdown_server_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + _tao_server_request.argument_flag (0); + CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); + + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->shutdown_server ( - server.in (), + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::Administration::server_is_running_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var _tao_retval; + CORBA::String_var _tao_retval; CORBA::String_var server; CORBA::String_var addr; ImplementationRepository::ServerObject_var server_object; @@ -772,26 +2014,82 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( (_tao_in >> addr.out ()) && (_tao_in >> server_object.out ()) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); - _tao_retval = _tao_impl->server_is_running ( - server.in (), - addr.in (), - server_object.in (), - ACE_TRY_ENV - ); +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); - ACE_CHECK; + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri ( + _tao_server_request, + _tao_impl, + server.in (), + addr.in (), + server_object.in (), + ACE_TRY_ENV + ); + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + _tao_retval = + _tao_impl->server_is_running ( + server.in (), + addr.in (), + server_object.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + char * _tao_retval_info = _tao_retval._retn (); + ri.result (_tao_retval_info); + _tao_retval = _tao_retval_info; + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( - (_tao_out << _tao_retval.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); + (_tao_out << _tao_retval.in ()) + )) + ACE_THROW (CORBA::MARSHAL()); + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ( @@ -799,62 +2097,165 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + _tao_server_request.argument_flag (0); + CORBA::String_var server; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); + + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->server_is_shutting_down ( - server.in (), + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::Administration::find_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::String_var server; + CORBA::String_var server; ImplementationRepository::ServerInformation_var info; if (!( (_tao_in >> server.out ()) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->find ( - server.in (), - info.out (), + server.in (), + info.out (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( - (_tao_out << info.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); + (_tao_out << info.in ()) + )) + ACE_THROW (CORBA::MARSHAL()); + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_ImplementationRepository::Administration::list_skel ( @@ -862,38 +2263,90 @@ void POA_ImplementationRepository::Administration::list_skel ( void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; - CORBA::ULong how_many; + CORBA::ULong how_many; ImplementationRepository::ServerInformationList_var server_list; ImplementationRepository::ServerInformationIterator_var server_iterator; if (!( (_tao_in >> how_many) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri ( + _tao_server_request, + _tao_impl, + how_many +, + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + _tao_impl->list ( - how_many, - server_list.out (), - server_iterator.out (), + how_many, + server_list.out (), + server_iterator.out (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( - (_tao_out << server_list.in ()) && - (_tao_out << server_iterator.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); + (_tao_out << server_list.in ()) && + (_tao_out << server_iterator.in ()) + )) + ACE_THROW (CORBA::MARSHAL()); + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_ImplementationRepository::Administration::_is_a_skel ( @@ -907,7 +2360,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; CORBA::Boolean _tao_retval = 0; CORBA::String_var value; - if (!((_tao_in >> value.out ()))) + if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); @@ -915,7 +2368,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } @@ -932,18 +2385,69 @@ void POA_ImplementationRepository::Administration::_non_existent_skel ( _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } +void POA_ImplementationRepository::Administration::_interface_skel ( + TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) +{ + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; + CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::Boolean _tao_result = 0; + + TAO_IFR_Client_Adapter *_tao_adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); + + if (_tao_adapter == 0) + { + ACE_THROW (CORBA::INTF_REPOS ()); + } + + ACE_TRY + { + _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + ACE_TRY_CHECK; + + _tao_server_request.init_reply (); + + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + + _tao_result = + _tao_adapter->interfacedef_cdr_insert ( + _tao_out, + _tao_retval + ); + } + ACE_CATCHALL + { + _tao_adapter->dispose (_tao_retval); + } + ACE_ENDTRY; + + if (_tao_result == 0) + { + ACE_THROW (CORBA::MARSHAL ()); + } +} + CORBA::Boolean POA_ImplementationRepository::Administration::_is_a ( const char* value, CORBA::Environment &ACE_TRY_ENV ) { + const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) + (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else return 0; @@ -953,9 +2457,9 @@ void* POA_ImplementationRepository::Administration::_downcast ( const char* logical_type_id ) { -if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/Administration:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/Administration:1.0") == 0) return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); return 0; } @@ -975,397 +2479,829 @@ POA_ImplementationRepository::Administration::_this (CORBA_Environment &ACE_TRY_ { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); + + CORBA::Object_ptr tmp = CORBA::Object::_nil (); + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) - { - case TAO_ORB_Core::THRU_POA: - { - ::ImplementationRepository::Administration_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_ImplementationRepository::_tao_thru_poa_collocated_Administration (stub), - 0 - ); - return retval; - } - case TAO_ORB_Core::DIRECT: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - default: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - } + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); + + CORBA::Object_var obj = tmp; + return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ()); +} + + +#if (TAO_HAS_INTERCEPTORS == 1) +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + CORBA::Environment & + ) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, + {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + }; + + exception_list->length (2); + for (CORBA::ULong i = 0; i < 2; ++i) { - // stub->_incr_refcnt (); - CORBA::Object_ptr tmp = CORBA::Object::_nil (); - ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0); - CORBA::Object_var obj = tmp; - return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ()); + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; } + + return safe_exception_list._retn (); +} + +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; } -POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::_tao_thru_poa_collocated_Administration ( - TAO_Stub *stub -) - : CORBA_Object (stub, 1) +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); } -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::_is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment & ) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server), + options_ (options) +{} +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_is_a", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->_is_a (logical_type_id, ACE_TRY_ENV); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; + + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::_non_existent( - CORBA_Environment &ACE_TRY_ENV - ) + Dynamic::ExceptionList_var safe_exception_list = exception_list; + static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_non_existent", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->_non_existent (ACE_TRY_ENV); + + return result_any; } +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::activate_server ( - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )) +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "activate_server", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->activate_server ( - server, - ACE_TRY_ENV - ); - return; + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::register_server ( +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server), + options_ (options) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "register_server", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->register_server ( - server, - options, - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; + + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::reregister_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "reregister_server", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->reregister_server ( - server, - options, - ACE_TRY_ENV - ); - return; + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::remove_server ( +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} + +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, const char * server, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "remove_server", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->remove_server ( - server, - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::shutdown_server ( +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, const char * server, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "shutdown_server", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->shutdown_server ( - server, - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); } -char * POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::server_is_running ( +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} + +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server), + addr_ (addr), + server_object_ (server_object) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var _tao_retval; - ACE_UNUSED_ARG (_tao_retval); - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "server_is_running", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->server_is_running ( - server, - addr, - server_object, - ACE_TRY_ENV - ); + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_addr = parameter_list->length (); + parameter_list->length (length_addr + 1); + (*parameter_list)[length_addr].argument <<= addr_; + (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN; + + CORBA::ULong length_server_object = parameter_list->length (); + parameter_list->length (length_server_object + 1); + (*parameter_list)[length_server_object].argument <<= this->server_object_; + + (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 0; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + CORBA::Any_var safe_result_any = result_any; + + (*result_any) <<= this->_result; + + return safe_result_any._retn (); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::server_is_shutting_down ( +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} + +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +void +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) +{ + // Update the result. + this->_result = result; +} + +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, const char * server, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "server_is_shutting_down", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->server_is_shutting_down ( - server, - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); +} + +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} + +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::find ( +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, const char * server, - ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + server_ (server) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "find", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->find ( - server, - info, - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -void POA_ImplementationRepository::_tao_thru_poa_collocated_Administration::list ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ExceptionList_var safe_exception_list = exception_list; + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc; + TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); + (*exception_list)[i] = tcp_object; + } + + return safe_exception_list._retn (); +} + +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return result_any; +} + +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} + +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const CORBA::ULong & how_many +, + CORBA::Environment & ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + how_many_ (how_many) + +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "list", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::Administration_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/Administration:1.0" - ) - )->list ( - how_many, - server_list, - server_iterator, - ACE_TRY_ENV - ); - return; + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; + + + return safe_parameter_list._retn (); } +Dynamic::ExceptionList * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} +CORBA::Any * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return result_any; +} + +char * +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} + +CORBA::Boolean +POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +#endif /* TAO_HAS_INTERCEPTORS */ class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { private: @@ -1373,9 +3309,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 12:16:37 */ +/* starting time is 16:33:09 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /home/coryan/subsets/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1395,7 +3331,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::has 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, - 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 0, 14, @@ -1419,7 +3355,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::has 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 0, 14, 14, - 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, #endif /* ACE_MVS */ @@ -1432,7 +3368,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo { enum { - TOTAL_KEYWORDS = 4, + TOTAL_KEYWORDS = 5, MIN_WORD_LENGTH = 5, MAX_WORD_LENGTH = 13, MIN_HASH_VALUE = 5, @@ -1447,7 +3383,9 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel}, {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, - {"",0},{"",0},{"",0},{"",0},{"",0}, + {"",0},{"",0}, + {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel}, + {"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel}, }; @@ -1465,48 +3403,255 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo } return 0; } -/* ending time is 12:16:37 */ +/* ending time is 16:33:09 */ static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable; -ImplementationRepository::ServerInformationIterator_ptr _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory ( - CORBA::Object_ptr obj + +/////////////////////////////////////////////////////////////////////// +// Strategized Proxy Broker Implementation +// + +// Factory function Implementation. +POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) +{ + static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker strategized_proxy_broker; + return &strategized_proxy_broker; +} + +POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) +{ + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + this->proxy_cache_[i] = 0; + +} + +POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) +{ + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + delete this->proxy_cache_[i]; + +} + +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& +POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::select_proxy ( + ::ImplementationRepository::ServerInformationIterator *object, + CORBA::Environment &ACE_TRY_ENV + ) +{ + int strategy = + TAO_ORB_Core::collocation_strategy (object); + + if (this->proxy_cache_[strategy] != 0) + return *this->proxy_cache_[strategy]; + + this->create_proxy (strategy, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); + + return *this->proxy_cache_[strategy]; + +} + +void +POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( + int strategy, + CORBA::Environment &ACE_TRY_ENV ) { - TAO_Stub *stub = obj->_stubobj (); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) + if (this->proxy_cache_[strategy] == 0) { - case TAO_ORB_Core::THRU_POA: - { - ImplementationRepository::ServerInformationIterator_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator (stub), - 0 - ); - return retval; + switch (strategy) + { + case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: + default: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], + ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl, + CORBA::NO_MEMORY () + ); + ACE_CHECK; + break; + } - case TAO_ORB_Core::DIRECT: - break; - default: - break; - } - return 0; + + } +} + + +// +// End Strategized Proxy Broker Implementation +/////////////////////////////////////////////////////////////////////// + + +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * +ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj) +{ + ACE_UNUSED_ARG (obj); + return ::POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker(); } -int _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer (long dummy) +int +ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long _dummy_) { - ACE_UNUSED_ARG (dummy); + ACE_UNUSED_ARG (_dummy_); - _TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer = - _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory; + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function; return 0; } -static int _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer_Scarecrow = - _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer)); +static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer)); + + +/////////////////////////////////////////////////////////////////////// +// ThruPOA Proxy Implementation +// + +POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) +{} + +// ThruPOA Implementation of the IDL interface methods + +CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + CORBA::Boolean _tao_retval = 0; + ACE_UNUSED_ARG (_tao_retval); + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "next_n", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK_RETURN (_tao_retval); + return ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerInformationIterator_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/ServerInformationIterator:1.0" + ) + )->next_n ( + how_many, + server_list, + ACE_TRY_ENV + ); +} + +void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + TAO_Object_Adapter::Servant_Upcall servant_upcall ( + _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () + ); + CORBA::Object_var forward_to; + servant_upcall.prepare_for_upcall ( + _collocated_tao_target_->_object_key (), + "destroy", + forward_to.out (), + ACE_TRY_ENV + ); + ACE_CHECK; + ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerInformationIterator_ptr, + servant_upcall.servant ()->_downcast ( + "IDL:ImplementationRepository/ServerInformationIterator:1.0" + ) + )->destroy ( + ACE_TRY_ENV + ); + return; +} + +// +// End ThruPOA Proxy Implementation +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Direct Proxy Implementation +// + +POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) +{} + +CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + return ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerInformationIterator_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0") + )->next_n ( + how_many, + server_list, + ACE_TRY_ENV + ); + +} + +void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) +{ + ACE_reinterpret_cast ( + POA_ImplementationRepository::ServerInformationIterator_ptr, + _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0") + )->destroy ( + ACE_TRY_ENV + ); + +} + +// +// End Direct Proxy Implementation +/////////////////////////////////////////////////////////////////////// // skeleton constructor POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void) { @@ -1528,36 +3673,90 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; - CORBA::Boolean _tao_retval = 0; + CORBA::Boolean _tao_retval = 0; CORBA::ULong how_many; ImplementationRepository::ServerInformationList_var server_list; if (!( (_tao_in >> how_many) )) - ACE_THROW (CORBA::MARSHAL () ); + ACE_THROW (CORBA::MARSHAL()); - _tao_retval = _tao_impl->next_n ( - how_many, - server_list.out (), - ACE_TRY_ENV - ); - ACE_CHECK; +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( + _tao_server_request, + _tao_impl, + how_many, + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ + _tao_retval = + _tao_impl->next_n ( + how_many, + server_list.out (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + CORBA::Boolean _tao_retval_info = _tao_retval; + ri.result (_tao_retval_info); + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( - (_tao_out << CORBA::Any::from_boolean (_tao_retval)) && - (_tao_out << server_list.in ()) - )) - ACE_THROW (CORBA::MARSHAL () ); + (_tao_out << CORBA::Any::from_boolean (_tao_retval)) && + (_tao_out << server_list.in ()) + )) + ACE_THROW (CORBA::MARSHAL()); + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( @@ -1565,20 +3764,70 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( void *_tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV -) + ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; + _tao_server_request.argument_flag (0); + +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); + + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( + _tao_server_request, + _tao_impl, + ACE_TRY_ENV + ); + + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + +#endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->destroy ( + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; + +#if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { + ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, ACE_TRY_ENV ); - - ACE_CHECK; - + ACE_TRY_CHECK; + _tao_server_request.forward_location (exc.forward.in ()); + } + ACE_CATCHANY + { + ri.exception (&ACE_ANY_EXCEPTION); + _tao_vfr.send_exception ( + &ri, + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; +#endif /* TAO_HAS_INTERCEPTORS */ _tao_server_request.init_reply (); - } + + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); +} void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( TAO_ServerRequest &_tao_server_request, @@ -1591,7 +3840,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; CORBA::Boolean _tao_retval = 0; CORBA::String_var value; - if (!((_tao_in >> value.out ()))) + if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); @@ -1599,7 +3848,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } @@ -1616,18 +3865,69 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel _tao_server_request.init_reply (); TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval)))) + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) ACE_THROW (CORBA::MARSHAL ()); } +void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( + TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) +{ + POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; + CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::Boolean _tao_result = 0; + + TAO_IFR_Client_Adapter *_tao_adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); + + if (_tao_adapter == 0) + { + ACE_THROW (CORBA::INTF_REPOS ()); + } + + ACE_TRY + { + _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + ACE_TRY_CHECK; + + _tao_server_request.init_reply (); + + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + + _tao_result = + _tao_adapter->interfacedef_cdr_insert ( + _tao_out, + _tao_retval + ); + } + ACE_CATCHALL + { + _tao_adapter->dispose (_tao_retval); + } + ACE_ENDTRY; + + if (_tao_result == 0) + { + ACE_THROW (CORBA::MARSHAL ()); + } +} + CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a ( const char* value, CORBA::Environment &ACE_TRY_ENV ) { + const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) + (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else return 0; @@ -1637,9 +3937,9 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast ( const char* logical_type_id ) { -if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerInformationIterator:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:ImplementationRepository/ServerInformationIterator:1.0") == 0) return ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); return 0; } @@ -1659,152 +3959,168 @@ POA_ImplementationRepository::ServerInformationIterator::_this (CORBA_Environmen { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); + + CORBA::Object_ptr tmp = CORBA::Object::_nil (); + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) - { - case TAO_ORB_Core::THRU_POA: - { - ::ImplementationRepository::ServerInformationIterator_ptr retval = 0; - ACE_NEW_RETURN ( - retval, - POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator (stub), - 0 - ); - return retval; - } - case TAO_ORB_Core::DIRECT: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - default: - ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - } + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); else - { - // stub->_incr_refcnt (); - CORBA::Object_ptr tmp = CORBA::Object::_nil (); - ACE_NEW_RETURN (tmp, CORBA::Object (stub), 0); - CORBA::Object_var obj = tmp; - return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ()); - } + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); + + CORBA::Object_var obj = tmp; + return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ()); } -POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator::_tao_thru_poa_collocated_ServerInformationIterator ( - TAO_Stub *stub -) - : CORBA_Object (stub, 1) + +#if (TAO_HAS_INTERCEPTORS == 1) +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerInformationIterator *tao_impl, + const CORBA::ULong & how_many, + CORBA::Environment & + ) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), + how_many_ (how_many) +{} + +Dynamic::ParameterList * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + Dynamic::ParameterList_var safe_parameter_list = parameter_list; + + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; + + return safe_parameter_list._retn (); } -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator::_is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV - ) +Dynamic::ExceptionList * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} +CORBA::Any * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_is_a", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the result on demand. + CORBA::Boolean tk_void_any = 0; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerInformationIterator_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerInformationIterator:1.0" - ) - )->_is_a (logical_type_id, ACE_TRY_ENV); + + CORBA::Any_var safe_result_any = result_any; + + (*result_any) <<= CORBA::Any::from_boolean (this->_result); + + return safe_result_any._retn (); } +char * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); +} -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator::_non_existent( - CORBA_Environment &ACE_TRY_ENV +CORBA::Boolean +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +void +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) +{ + // Update the result. + this->_result = result; +} + +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerInformationIterator *tao_impl, + CORBA::Environment & ) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl) +{} +Dynamic::ParameterList * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "_non_existent", - forward_to.out (), - ACE_TRY_ENV - ); + // Generate the argument list on demand. + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerInformationIterator_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerInformationIterator:1.0" - ) - )->_non_existent (ACE_TRY_ENV); + + return parameter_list; } +Dynamic::ExceptionList * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Generate the exception list on demand. + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return exception_list; +} -CORBA::Boolean POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator::next_n ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +CORBA::Any * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean _tao_retval = 0; - ACE_UNUSED_ARG (_tao_retval); - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "next_n", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK_RETURN (_tao_retval); - return ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerInformationIterator_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerInformationIterator:1.0" - ) - )->next_n ( - how_many, - server_list, - ACE_TRY_ENV - ); + // Generate the result on demand. + CORBA::Boolean tk_void_any = 1; + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + return result_any; } -void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIterator::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) +char * +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface ( + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( - this->_stubobj ()->servant_orb_var ()->orb_core () - ); - CORBA::Object_var forward_to; - servant_upcall.prepare_for_upcall ( - this->_object_key (), - "destroy", - forward_to.out (), - ACE_TRY_ENV - ); - ACE_CHECK; - ACE_reinterpret_cast ( - POA_ImplementationRepository::ServerInformationIterator_ptr, - servant_upcall.servant ()->_downcast ( - "IDL:ImplementationRepository/ServerInformationIterator:1.0" - ) - )->destroy ( - ACE_TRY_ENV - ); - return; + return + CORBA::string_dup (this->_tao_impl->_interface_repository_id ()); } + +CORBA::Boolean +POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); +} + +#endif /* TAO_HAS_INTERCEPTORS */ + +#endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index b90e32dea43..86c5de08e92 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -1,24 +1,42 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_H_ -#define _TAO_IDL_IMPLREPOS_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_ +#define _TAO_IDL_ORIG_IMPLREPOS_H_ +#include "ace/pre.h" #include "ImplRepoC.h" -#include "Servant_Base.h" -#include "PortableServerC.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" +#include "tao/PortableServer/Collocated_Object.h" +#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" +#include "tao/PortableServer/Direct_Object_Proxy_Impl.h" +#include "tao/PortableServer/ServerRequestInfo.h" + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -26,10 +44,19 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + TAO_NAMESPACE POA_ImplementationRepository { class ServerObject; typedef ServerObject *ServerObject_ptr; + // Forward Classes Declaration + 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: @@ -66,6 +93,14 @@ TAO_NAMESPACE POA_ImplementationRepository TAO_default_environment () ); + static void _interface_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + virtual void _dispatch ( TAO_ServerRequest &_tao_req, void *_tao_context, @@ -113,792 +148,1810 @@ TAO_NAMESPACE POA_ImplementationRepository ); - }; +#if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts + // and build the lists dynamically on demand so that unnecessary time overhead + // of building these lists when they arent used is avoided. + class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::ServerObject; + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerObject *tao_impl, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); -#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___THRU_POA_COLLOCATED_SH_) -#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___THRU_POA_COLLOCATED_SH_ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - class TAO_PortableServer_Export _tao_thru_poa_collocated_ServerObject : public virtual ::ImplementationRepository::ServerObject - { - public: - _tao_thru_poa_collocated_ServerObject ( - TAO_Stub *stub - ); - virtual CORBA::Boolean _is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean _non_existent( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void ping ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown ( + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); + + private: + POA_ImplementationRepository::ServerObject *_tao_impl; + + }; + + class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::ServerObject; + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerObject *tao_impl, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - }; + virtual Dynamic::ParameterList * arguments ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); -#endif /* end #if !defined */ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_PortableServer_Export ServerObject_tie : public ServerObject - { - public: - ServerObject_tie (T &t); - // the T& ctor - ServerObject_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - ServerObject_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~ServerObject_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = - TAO_default_environment () - ); - void ping ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; + private: + POA_ImplementationRepository::ServerObject *_tao_impl; + + }; + + #endif /* TAO_HAS_INTERCEPTORS */ - // copy and assignment are not allowed - ServerObject_tie (const ServerObject_tie &); - void operator= (const ServerObject_tie &); }; -#endif /* ACE_HAS_USING_KEYWORD */ - class Administration; - typedef Administration *Administration_ptr; - class TAO_PortableServer_Export Administration : public virtual PortableServer::ServantBase + /////////////////////////////////////////////////////////////////////// + // Strategized Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker { - protected: - Administration (void); + public: + _TAO_ServerObject_Strategized_Proxy_Broker (void); + + virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void); + + virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy ( + ::ImplementationRepository::ServerObject *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); + + private: + + // Helper methods that takes care to create the proxy + // as soon as their use is necessary. + void create_proxy ( + int collocation_strategy, + CORBA::Environment &ACE_TRY_ENV + ); + + private: + + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + + TAO_SYNCH_MUTEX mutex_; + // This funxtion is used to get an handle to the unique instance + // of the Strategized Proxy Broker that is available for a given + // interface. public: - Administration (const Administration& rhs); - virtual ~Administration (void); + static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void); + }; - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + // + // End Strategized Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// - virtual void* _downcast ( - const char* logical_type_id - ); - static void _is_a_skel ( - TAO_ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +/////////////////////////////////////////////////////////////////////// +// ThruPOA Impl. Declaration +// - static void _non_existent_skel ( - TAO_ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : + public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl +{ +public: + _TAO_ServerObject_ThruPOA_Proxy_Impl (void); - virtual void _dispatch ( - TAO_ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { } - ::ImplementationRepository::Administration *_this ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); - virtual const char* _interface_repository_id (void) const; + virtual void shutdown ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); - virtual void activate_server ( - const char * server, +}; + + +// +// ThruPOA Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Direct Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : + public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl +{ +public: + _TAO_ServerObject_Direct_Proxy_Impl (void); + + virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { } + + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void shutdown ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +}; + + +// +// Direct Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +#if defined (ACE_HAS_USING_KEYWORD) +// TIE class: Refer to CORBA v2.2, Section 20.34.4 +template <class T> +class TAO_PortableServer_Export ServerObject_tie : public ServerObject +{ +public: + ServerObject_tie (T &t); + // the T& ctor + ServerObject_tie (T &t, PortableServer::POA_ptr poa); + // ctor taking a POA + ServerObject_tie (T *tp, CORBA::Boolean release=1); + // ctor taking pointer and an ownership flag + ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); + // ctor with T*, ownership flag and a POA + ~ServerObject_tie (void); + // dtor + + // TIE specific functions + T *_tied_object (void); + // return the underlying object + void _tied_object (T &obj); + // set the underlying object + void _tied_object (T *obj, CORBA::Boolean release=1); + // set the underlying object and the ownership flag + CORBA::Boolean _is_owner (void); + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership + + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + void ping ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + void shutdown ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +private: + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; + + // copy and assignment are not allowed + ServerObject_tie (const ServerObject_tie &); + void operator= (const ServerObject_tie &); +}; + +#endif /* ACE_HAS_USING_KEYWORD */ + +class Administration; +typedef Administration *Administration_ptr; +// Forward Classes Declaration +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: + Administration (const Administration& rhs); + virtual ~Administration (void); + + + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void* _downcast ( + const char* logical_type_id + ); + + static void _is_a_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static void _non_existent_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static void _interface_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void _dispatch ( + TAO_ServerRequest &_tao_req, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + ::ImplementationRepository::Administration *_this ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual const char* _interface_repository_id (void) const; + + virtual void activate_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )) = 0; + + static void activate_server_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void register_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )) = 0; + + static void register_server_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void reregister_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + static void reregister_server_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void remove_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + static void remove_server_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void shutdown_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + static void shutdown_server_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual char * server_is_running ( + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + static void server_is_running_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void server_is_shutting_down ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + static void server_is_shutting_down_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void find ( + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + static void find_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void list ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + static void list_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + +#if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts + // and build the lists dynamically on demand so that unnecessary time overhead + // of building these lists when they arent used is avoided. + class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void activate_server_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void register_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void register_server_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); + + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + + }; - virtual void reregister_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, + class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void reregister_server_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void remove_server ( - const char * server, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void remove_server_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); - virtual void shutdown_server ( - const char * server, + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + const ImplementationRepository::StartupOptions & options_; + + }; + + class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void shutdown_server_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * server_is_running ( - const char * server, - const char * addr, - ImplementationRepository::ServerObject_ptr server_object, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void server_is_running_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); + + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + const ImplementationRepository::StartupOptions & options_; + + }; + + class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - virtual void server_is_shutting_down ( - const char * server, + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void server_is_shutting_down_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void find ( - const char * server, - ImplementationRepository::ServerInformation_out info, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void find_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); + + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + + }; + + class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void list ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + ACE_THROW_SPEC ((CORBA::SystemException)); - static void list_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - }; + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; -#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___THRU_POA_COLLOCATED_SH_) -#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___THRU_POA_COLLOCATED_SH_ + }; - class TAO_PortableServer_Export _tao_thru_poa_collocated_Administration - : public virtual ::ImplementationRepository::Administration + class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo { public: - _tao_thru_poa_collocated_Administration ( - TAO_Stub *stub - ); - virtual CORBA::Boolean _is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - virtual CORBA::Boolean _non_existent( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - - virtual void activate_server ( - const char * server, + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void register_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void reregister_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); + + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + const char * addr_; + ImplementationRepository::ServerObject_ptr server_object_; + void result (char * result); + // update the result + char * _result; + }; + + class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - virtual void remove_server ( - const char * server, + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown_server ( - const char * server, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * server_is_running ( - const char * server, - const char * addr, - ImplementationRepository::ServerObject_ptr server_object, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); - virtual void server_is_shutting_down ( - const char * server, + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + + }; + + class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_find ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void find ( - const char * server, - ImplementationRepository::ServerInformation_out info, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void list ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - }; + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); -#endif /* end #if !defined */ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_PortableServer_Export Administration_tie : public Administration + }; + + class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo { public: - Administration_tie (T &t); - // the T& ctor - Administration_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - Administration_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~Administration_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = - TAO_default_environment () - ); - void activate_server ( - const char * server, + friend class POA_ImplementationRepository::Administration; + TAO_ServerRequestInfo_ImplementationRepository_Administration_list ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const CORBA::ULong & how_many +, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - void register_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - void reregister_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); + + private: + POA_ImplementationRepository::Administration *_tao_impl; + const CORBA::ULong & how_many_; + + + }; + + #endif /* TAO_HAS_INTERCEPTORS */ + +}; + + +/////////////////////////////////////////////////////////////////////// +// Strategized Proxy Broker Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker +{ +public: + _TAO_Administration_Strategized_Proxy_Broker (void); + + virtual ~_TAO_Administration_Strategized_Proxy_Broker (void); - void remove_server ( - const char * server, + virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy ( + ::ImplementationRepository::Administration *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); + +private: + +// Helper methods that takes care to create the proxy +// as soon as their use is necessary. + void create_proxy ( + int collocation_strategy, + CORBA::Environment &ACE_TRY_ENV + ); + +private: + + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::ImplementationRepository::_TAO_Administration_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; + + TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. + +public: + static _TAO_Administration_Strategized_Proxy_Broker *the_TAO_Administration_Strategized_Proxy_Broker (void); +}; + + +// +// End Strategized Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// ThruPOA Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : + public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl +{ +public: + _TAO_Administration_ThruPOA_Proxy_Impl (void); + + virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { } + + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )); + + virtual void register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )); + + virtual void reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual char * server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +}; + + +// +// ThruPOA Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////// +// Direct Impl. Declaration +// + +class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : + public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl +{ +public: + _TAO_Administration_Direct_Proxy_Impl (void); + + virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { } + + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )); + + virtual void register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )); + + virtual void reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual char * server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +}; + + +// +// Direct Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +#if defined (ACE_HAS_USING_KEYWORD) +// TIE class: Refer to CORBA v2.2, Section 20.34.4 +template <class T> +class TAO_PortableServer_Export Administration_tie : public Administration +{ +public: + Administration_tie (T &t); + // the T& ctor + Administration_tie (T &t, PortableServer::POA_ptr poa); + // ctor taking a POA + Administration_tie (T *tp, CORBA::Boolean release=1); + // ctor taking pointer and an ownership flag + Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); + // ctor with T*, ownership flag and a POA + ~Administration_tie (void); + // dtor + + // TIE specific functions + T *_tied_object (void); + // return the underlying object + void _tied_object (T &obj); + // set the underlying object + void _tied_object (T *obj, CORBA::Boolean release=1); + // set the underlying object and the ownership flag + CORBA::Boolean _is_owner (void); + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership + + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + void activate_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )); + + void register_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )); + + void reregister_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + void remove_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + void shutdown_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + char * server_is_running ( + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + void server_is_shutting_down ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + void find ( + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + void list ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +private: + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; + + // copy and assignment are not allowed + Administration_tie (const Administration_tie &); + void operator= (const Administration_tie &); +}; + +#endif /* ACE_HAS_USING_KEYWORD */ + +class ServerInformationIterator; +typedef ServerInformationIterator *ServerInformationIterator_ptr; +// Forward Classes Declaration +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: + ServerInformationIterator (const ServerInformationIterator& rhs); + virtual ~ServerInformationIterator (void); + + + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void* _downcast ( + const char* logical_type_id + ); + + static void _is_a_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static void _non_existent_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static void _interface_skel ( + TAO_ServerRequest &req, + void *obj, + void *context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void _dispatch ( + TAO_ServerRequest &_tao_req, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + ::ImplementationRepository::ServerInformationIterator *_this ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual const char* _interface_repository_id (void) const; + + virtual CORBA::Boolean next_n ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + static void next_n_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void destroy ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + static void destroy_skel ( + TAO_ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + +#if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts + // and build the lists dynamically on demand so that unnecessary time overhead + // of building these lists when they arent used is avoided. + class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::ServerInformationIterator; + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerInformationIterator *tao_impl, + const CORBA::ULong & how_many, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown_server ( - const char * server, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - char * server_is_running ( - const char * server, - const char * addr, - ImplementationRepository::ServerObject_ptr server_object, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + + private: + POA_ImplementationRepository::ServerInformationIterator *_tao_impl; + const CORBA::ULong & how_many_; + void result (CORBA::Boolean result); + // update the result + CORBA::Boolean _result; + }; + + class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo + { + public: + friend class POA_ImplementationRepository::ServerInformationIterator; + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerInformationIterator *tao_impl, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); - void server_is_shutting_down ( - const char * server, + virtual Dynamic::ParameterList * arguments ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - void find ( - const char * server, - ImplementationRepository::ServerInformation_out info, + virtual Dynamic::ExceptionList * exceptions ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); + ACE_THROW_SPEC ((CORBA::SystemException)); - void list ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, + virtual CORBA::Any * result ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ACE_THROW_SPEC ((CORBA::SystemException)); -private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); + + private: + POA_ImplementationRepository::ServerInformationIterator *_tao_impl; - // copy and assignment are not allowed - Administration_tie (const Administration_tie &); - void operator= (const Administration_tie &); }; -#endif /* ACE_HAS_USING_KEYWORD */ + #endif /* TAO_HAS_INTERCEPTORS */ - class ServerInformationIterator; - typedef ServerInformationIterator *ServerInformationIterator_ptr; - class TAO_PortableServer_Export ServerInformationIterator : public virtual PortableServer::ServantBase - { - protected: - ServerInformationIterator (void); +}; - public: - ServerInformationIterator (const ServerInformationIterator& rhs); - virtual ~ServerInformationIterator (void); +/////////////////////////////////////////////////////////////////////// +// Strategized Proxy Broker Declaration +// - virtual CORBA::Boolean _is_a ( - const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker +{ +public: + _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); - virtual void* _downcast ( - const char* logical_type_id - ); + virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); - static void _is_a_skel ( - TAO_ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ::ImplementationRepository::ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); - static void _non_existent_skel ( - TAO_ServerRequest &req, - void *obj, - void *context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +private: - virtual void _dispatch ( - TAO_ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +// Helper methods that takes care to create the proxy +// as soon as their use is necessary. + void create_proxy ( + int collocation_strategy, + CORBA::Environment &ACE_TRY_ENV + ); - ::ImplementationRepository::ServerInformationIterator *_this ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +private: - virtual const char* _interface_repository_id (void) const; + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; - virtual CORBA::Boolean next_n ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; + TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. - static void next_n_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +public: + static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); +}; - virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - static void destroy_skel ( - TAO_ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); +// +// End Strategized Proxy Broker Declaration +/////////////////////////////////////////////////////////////////////// - }; +/////////////////////////////////////////////////////////////////////// +// ThruPOA Impl. Declaration +// +class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : + public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl +{ +public: + _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void); -#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___THRU_POA_COLLOCATED_SH_) -#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___THRU_POA_COLLOCATED_SH_ + virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { } - class TAO_PortableServer_Export _tao_thru_poa_collocated_ServerInformationIterator - : public virtual ::ImplementationRepository::ServerInformationIterator - { - public: - _tao_thru_poa_collocated_ServerInformationIterator ( - TAO_Stub *stub - ); - virtual CORBA::Boolean _is_a( - const CORBA::Char *logical_type_id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +}; - virtual CORBA::Boolean _non_existent( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - virtual CORBA::Boolean next_n ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); +// +// ThruPOA Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// - virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - }; +/////////////////////////////////////////////////////////////////////// +// Direct Impl. Declaration +// +class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : + public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl +{ +public: + _TAO_ServerInformationIterator_Direct_Proxy_Impl (void); -#endif /* end #if !defined */ + virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { } + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + +}; -#if defined (ACE_HAS_USING_KEYWORD) - // TIE class: Refer to CORBA v2.2, Section 20.34.4 - template <class T> - class TAO_PortableServer_Export ServerInformationIterator_tie : public ServerInformationIterator - { - public: - ServerInformationIterator_tie (T &t); - // the T& ctor - ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa); - // ctor taking a POA - ServerInformationIterator_tie (T *tp, CORBA::Boolean release=1); - // ctor taking pointer and an ownership flag - ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); - // ctor with T*, ownership flag and a POA - ~ServerInformationIterator_tie (void); - // dtor - - // TIE specific functions - T *_tied_object (void); - // return the underlying object - void _tied_object (T &obj); - // set the underlying object - void _tied_object (T *obj, CORBA::Boolean release=1); - // set the underlying object and the ownership flag - CORBA::Boolean _is_owner (void); - // do we own it - void _is_owner (CORBA::Boolean b); - // set the ownership - - // overridden ServantBase operations - PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = - TAO_default_environment () - ); - CORBA::Boolean next_n ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); +// +// Direct Proxy Impl. Declaration +/////////////////////////////////////////////////////////////////////// + + +#if defined (ACE_HAS_USING_KEYWORD) +// TIE class: Refer to CORBA v2.2, Section 20.34.4 +template <class T> +class TAO_PortableServer_Export ServerInformationIterator_tie : public ServerInformationIterator +{ +public: + ServerInformationIterator_tie (T &t); + // the T& ctor + ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa); + // ctor taking a POA + ServerInformationIterator_tie (T *tp, CORBA::Boolean release=1); + // ctor taking pointer and an ownership flag + ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1); + // ctor with T*, ownership flag and a POA + ~ServerInformationIterator_tie (void); + // dtor + + // TIE specific functions + T *_tied_object (void); + // return the underlying object + void _tied_object (T &obj); + // set the underlying object + void _tied_object (T *obj, CORBA::Boolean release=1); + // set the underlying object and the ownership flag + CORBA::Boolean _is_owner (void); + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership + + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + CORBA::Boolean next_n ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + void destroy ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); private: - T *ptr_; - PortableServer::POA_var poa_; - CORBA::Boolean rel_; + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; - // copy and assignment are not allowed - ServerInformationIterator_tie (const ServerInformationIterator_tie &); - void operator= (const ServerInformationIterator_tie &); - }; + // copy and assignment are not allowed + ServerInformationIterator_tie (const ServerInformationIterator_tie &); + void operator= (const ServerInformationIterator_tie &); +}; #endif /* ACE_HAS_USING_KEYWORD */ @@ -915,5 +1968,9 @@ TAO_NAMESPACE_CLOSE #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/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i index 9386d854853..f455a06b8f0 100644 --- a/TAO/tao/PortableServer/ImplRepoS.i +++ b/TAO/tao/PortableServer/ImplRepoS.i @@ -1,8 +1,21 @@ -/* -*- C++ -*- $Id$ */ +// -*- C++ -*- +// +// $Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// **** 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html + diff --git a/TAO/tao/PortableServer/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp index 341ff292dff..33c9ff71548 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.cpp +++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp @@ -1,14 +1,26 @@ -/* -*- C++ -*- $Id$ */ +// -*- C++ -*- +// +// $Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// **** 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_T_CPP_ -#define _TAO_IDL_IMPLREPOS_T_CPP_ +#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_CPP_ +#define _TAO_IDL_ORIG_IMPLREPOS_T_CPP_ #include "ImplRepoS_T.h" diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h index 37cf44e03f2..16c66bd9d0a 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.h +++ b/TAO/tao/PortableServer/ImplRepoS_T.h @@ -1,16 +1,28 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_T_H_ -#define _TAO_IDL_IMPLREPOS_T_H_ -#include "ace/pre.h" +#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_H_ +#define _TAO_IDL_ORIG_IMPLREPOS_T_H_ +#include "ace/pre.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i index 25f991dfc5d..b3c4e54475a 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.i +++ b/TAO/tao/PortableServer/ImplRepoS_T.i @@ -1,11 +1,23 @@ -/* -*- C++ -*- $Id$ */ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. +// -*- 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/ // // Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html +// http://www.cs.wustl.edu/~schmidt/TAO.html #if defined (ACE_HAS_USING_KEYWORD) @@ -78,12 +90,12 @@ POA_ImplementationRepository::ServerObject_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (CORBA::Environment &env) +POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ServerObject::_default_POA (env); + return this->ServerObject::_default_POA (ACE_TRY_ENV); } template <class T> ACE_INLINE @@ -95,7 +107,7 @@ void POA_ImplementationRepository::ServerObject_tie<T>::ping ( )) { this->ptr_->ping ( - ACE_TRY_ENV +ACE_TRY_ENV ); } @@ -108,7 +120,7 @@ void POA_ImplementationRepository::ServerObject_tie<T>::shutdown ( )) { this->ptr_->shutdown ( - ACE_TRY_ENV +ACE_TRY_ENV ); } @@ -184,12 +196,12 @@ POA_ImplementationRepository::Administration_tie<T>::_is_owner (CORBA::Boolean b } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::Administration_tie<T>::_default_POA (CORBA::Environment &env) +POA_ImplementationRepository::Administration_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->Administration::_default_POA (env); + return this->Administration::_default_POA (ACE_TRY_ENV); } template <class T> ACE_INLINE @@ -204,7 +216,7 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server ( )) { this->ptr_->activate_server ( - server, +server, ACE_TRY_ENV ); } @@ -221,7 +233,7 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server ( )) { this->ptr_->register_server ( - server, +server, options, ACE_TRY_ENV ); @@ -238,7 +250,7 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server ( )) { this->ptr_->reregister_server ( - server, +server, options, ACE_TRY_ENV ); @@ -255,7 +267,7 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server ( )) { this->ptr_->remove_server ( - server, +server, ACE_TRY_ENV ); } @@ -271,7 +283,7 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server ( )) { this->ptr_->shutdown_server ( - server, +server, ACE_TRY_ENV ); } @@ -289,7 +301,7 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running ( )) { return this->ptr_->server_is_running ( - server, +server, addr, server_object, ACE_TRY_ENV @@ -307,7 +319,7 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow )) { this->ptr_->server_is_shutting_down ( - server, +server, ACE_TRY_ENV ); } @@ -324,7 +336,7 @@ void POA_ImplementationRepository::Administration_tie<T>::find ( )) { this->ptr_->find ( - server, +server, info, ACE_TRY_ENV ); @@ -342,7 +354,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( )) { this->ptr_->list ( - how_many, +how_many, server_list, server_iterator, ACE_TRY_ENV @@ -421,12 +433,12 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_is_owner (CORBA } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (CORBA::Environment &env) +POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ServerInformationIterator::_default_POA (env); + return this->ServerInformationIterator::_default_POA (ACE_TRY_ENV); } template <class T> ACE_INLINE @@ -440,7 +452,7 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n )) { return this->ptr_->next_n ( - how_many, +how_many, server_list, ACE_TRY_ENV ); @@ -455,7 +467,7 @@ void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy ( )) { this->ptr_->destroy ( - ACE_TRY_ENV +ACE_TRY_ENV ); } diff --git a/TAO/tao/diffs/ImplRepoC.cpp.diff b/TAO/tao/diffs/ImplRepoC.cpp.diff new file mode 100644 index 00000000000..472cb87c049 --- /dev/null +++ b/TAO/tao/diffs/ImplRepoC.cpp.diff @@ -0,0 +1,5019 @@ +--- orig/ImplRepoC.cpp Sun Apr 1 16:33:09 2001 ++++ ImplRepoC.cpp Sun Apr 1 17:47:26 2001 +@@ -23,6 +23,7 @@ + + #include "tao/Stub.h" + #include "tao/Invocation.h" ++#include "tao/PortableInterceptor.h" + + #if TAO_HAS_INTERCEPTORS == 1 + #include "tao/RequestInfo_Util.h" +@@ -38,7 +39,7 @@ + + + /////////////////////////////////////////////////////////////////////// +-// Base & Remote Proxy Implementation. ++// Base & Remote Proxy Implementation. + // + + ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void) +@@ -57,15 +58,15 @@ + CORBA::SystemException + )) + { +- + +- +- ++ ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "ping", +@@ -78,13 +79,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri ( + &_tao_call, +@@ -92,17 +93,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -110,7 +111,7 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV +@@ -119,16 +120,16 @@ + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -145,10 +146,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -156,8 +157,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -176,7 +177,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -184,10 +185,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( +@@ -198,15 +199,15 @@ + CORBA::SystemException + )) + { +- + +- +- ++ ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "shutdown", +@@ -219,13 +220,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( + &_tao_call, +@@ -233,17 +234,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -251,7 +252,7 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV +@@ -260,16 +261,16 @@ + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -286,10 +287,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -297,8 +298,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -317,7 +318,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -325,15 +326,15 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + + // +-// End Base & Remote Proxy Implemeentation. ++// End Base & Remote Proxy Implemeentation. + /////////////////////////////////////////////////////////////////////// + + +@@ -454,14 +455,14 @@ + stub, + 1, + obj->_servant ()), +- ++ + ServerObject::_nil ()); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerObject (stub, 0, obj->_servant ()), ServerObject::_nil ()); + return default_proxy; + } +- else ++ else + return + ACE_reinterpret_cast + ( +@@ -505,7 +506,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -523,10 +524,10 @@ + CORBA::SystemException + )) + { +- _TAO_ServerObject_Proxy_Impl &proxy = ++ _TAO_ServerObject_Proxy_Impl &proxy = + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.ping ( + this, + ACE_TRY_ENV +@@ -540,10 +541,10 @@ + CORBA::SystemException + )) + { +- _TAO_ServerObject_Proxy_Impl &proxy = ++ _TAO_ServerObject_Proxy_Impl &proxy = + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.shutdown ( + this, + ACE_TRY_ENV +@@ -555,7 +556,7 @@ + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target) + {} +@@ -568,7 +569,7 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return parameter_list; + } + +@@ -580,12 +581,12 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -594,14 +595,14 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target) + {} +@@ -614,7 +615,7 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return parameter_list; + } + +@@ -626,12 +627,12 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -640,7 +641,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -649,22 +650,22 @@ + { + 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 + }; + +@@ -685,36 +686,36 @@ + { + 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 + }; + +@@ -741,21 +742,21 @@ + { + 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 + }; + +@@ -774,7 +775,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) + #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_ + +@@ -783,43 +784,43 @@ + { + ImplementationRepository::EnvironmentVariable* tmp = 0; + tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length); +- ++ + if (this->buffer_ != 0) + { + ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; +- ++ + if (this->release_) + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old); +- ++ + } + this->buffer_ = tmp; + } +- ++ + void + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; +- ++ + ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_); +- ++ + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp); + this->buffer_ = 0; +- } +- ++ } ++ + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor. + { + this->_deallocate_buffer (); + } +- +- ++ ++ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) + #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_ +@@ -831,30 +832,30 @@ + ImplementationRepository::EnvironmentList::EnvironmentList (void) + {} + ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) + {} + ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release) +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) + {} + ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) + {} + ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor +@@ -872,23 +873,23 @@ + { + 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 +@@ -897,36 +898,36 @@ + 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, +@@ -950,37 +951,37 @@ + { + 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 + }; + +@@ -1001,56 +1002,56 @@ + { + 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 + 4, // 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 +@@ -1059,88 +1060,88 @@ + 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 + + }; +@@ -1168,95 +1169,95 @@ + { + 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 + 560, // 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 + 4, // 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 +@@ -1265,114 +1266,114 @@ + 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 + + + 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 + + }; +@@ -1398,7 +1399,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) + #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_ + +@@ -1407,43 +1408,43 @@ + { + ImplementationRepository::ServerInformation* tmp = 0; + tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length); +- ++ + if (this->buffer_ != 0) + { + ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; +- ++ + if (this->release_) + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old); +- ++ + } + this->buffer_ = tmp; + } +- ++ + void + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; +- ++ + ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_); +- ++ + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp); + this->buffer_ = 0; +- } +- ++ } ++ + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor. + { + this->_deallocate_buffer (); + } +- +- ++ ++ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) + #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_ +@@ -1455,30 +1456,30 @@ + ImplementationRepository::ServerInformationList::ServerInformationList (void) + {} + ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) + {} + ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release) +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) + {} + ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor +- : ++ : + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) + {} + ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor +@@ -1496,26 +1497,26 @@ + { + 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 + 828, // encapsulation length +@@ -1524,95 +1525,95 @@ + 812, // 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 + 560, // 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 + 4, // 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 +@@ -1621,114 +1622,114 @@ + 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 + + + 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 + + +@@ -1751,7 +1752,7 @@ + + + /////////////////////////////////////////////////////////////////////// +-// Base & Remote Proxy Implementation. ++// Base & Remote Proxy Implementation. + // + + ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void) +@@ -1773,21 +1774,21 @@ + ImplementationRepository::Administration::CannotActivate + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, + {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + }; + + +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "activate_server", +@@ -1800,13 +1801,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri ( + &_tao_call, +@@ -1815,17 +1816,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -1833,13 +1834,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) +@@ -1847,20 +1848,20 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -1877,10 +1878,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -1888,8 +1889,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -1908,7 +1909,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -1916,10 +1917,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server ( +@@ -1933,20 +1934,20 @@ + ImplementationRepository::Administration::AlreadyRegistered + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + }; + + +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "register_server", +@@ -1959,13 +1960,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri ( + &_tao_call, +@@ -1975,17 +1976,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -1993,13 +1994,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) && +@@ -2008,20 +2009,20 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -2038,10 +2039,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -2049,8 +2050,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -2069,7 +2070,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -2077,10 +2078,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server ( +@@ -2093,15 +2094,15 @@ + CORBA::SystemException + )) + { +- + +- +- ++ ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "reregister_server", +@@ -2114,13 +2115,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri ( + &_tao_call, +@@ -2130,17 +2131,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -2148,13 +2149,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) && +@@ -2163,20 +2164,20 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -2193,10 +2194,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -2204,8 +2205,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -2224,7 +2225,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -2232,10 +2233,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server ( +@@ -2248,20 +2249,20 @@ + ImplementationRepository::Administration::NotFound + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "remove_server", +@@ -2274,13 +2275,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri ( + &_tao_call, +@@ -2289,17 +2290,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -2307,13 +2308,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) +@@ -2321,20 +2322,20 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -2351,10 +2352,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -2362,8 +2363,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -2382,7 +2383,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -2390,10 +2391,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server ( +@@ -2406,20 +2407,20 @@ + ImplementationRepository::Administration::NotFound + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "shutdown_server", +@@ -2432,13 +2433,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( + &_tao_call, +@@ -2447,17 +2448,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -2465,13 +2466,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) +@@ -2479,20 +2480,20 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -2509,10 +2510,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -2520,8 +2521,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -2540,7 +2541,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -2548,10 +2549,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running ( +@@ -2566,20 +2567,20 @@ + ImplementationRepository::Administration::NotFound + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + CORBA::String_var _tao_safe_retval; +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "server_is_running", +@@ -2592,13 +2593,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri ( + &_tao_call, +@@ -2609,17 +2610,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK_RETURN (0); +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (0); +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -2627,13 +2628,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK_RETURN (0); +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK_RETURN (0); +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) && +@@ -2644,20 +2645,20 @@ + CORBA::MARSHAL (), + 0 + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (0); +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + 0 + ); +- ++ + } +- ++ + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_safe_retval.inout ()) +@@ -2667,15 +2668,15 @@ + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + 0 + ); +- ++ + } +- ++ + TAO_INTERCEPTOR ( + char * _tao_retval_info = _tao_safe_retval._retn (); + ri.result (_tao_retval_info); + _tao_safe_retval = _tao_retval_info; + ); +- ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -2692,10 +2693,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK_RETURN (0); +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -2703,8 +2704,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -2723,7 +2724,7 @@ + } + ACE_ENDTRY; + ACE_CHECK_RETURN (0); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -2731,7 +2732,7 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } + return _tao_safe_retval._retn (); +@@ -2747,20 +2748,20 @@ + ImplementationRepository::Administration::NotFound + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "server_is_shutting_down", +@@ -2773,13 +2774,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( + &_tao_call, +@@ -2788,17 +2789,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -2806,13 +2807,13 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( + (_tao_out << server) +@@ -2820,20 +2821,20 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -2850,10 +2851,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -2861,8 +2862,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -2881,7 +2882,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -2889,10 +2890,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( +@@ -2906,20 +2907,20 @@ + ImplementationRepository::Administration::NotFound + )) + { +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; + + +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + ACE_NEW (info.ptr (), ImplementationRepository::ServerInformation); + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, +@@ -2933,13 +2934,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri ( + &_tao_call, +@@ -2948,17 +2949,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -2966,33 +2967,33 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( +- (_tao_out << server) ++ (_tao_out << server) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- ++ + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> *info.ptr ()) +@@ -3001,9 +3002,9 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -3020,10 +3021,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -3031,8 +3032,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -3051,7 +3052,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -3059,10 +3060,10 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( +@@ -3076,15 +3077,15 @@ + CORBA::SystemException + )) + { +- + +- +- ++ ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + ACE_NEW (server_list.ptr (), ImplementationRepository::ServerInformationList); + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, +@@ -3098,33 +3099,33 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri ( + &_tao_call, + _collocated_tao_target_, +- how_many ++ how_many + , + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -3132,33 +3133,33 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( +- (_tao_out << how_many) ++ (_tao_out << how_many) + )) + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL () + ); +- ++ + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- ++ + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> *server_list.ptr ()) && +@@ -3168,9 +3169,9 @@ + TAO_INTERCEPTOR_THROW ( + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -3187,10 +3188,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -3198,8 +3199,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -3218,7 +3219,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -3226,15 +3227,15 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + + // +-// End Base & Remote Proxy Implemeentation. ++// End Base & Remote Proxy Implemeentation. + /////////////////////////////////////////////////////////////////////// + + +@@ -3355,14 +3356,14 @@ + stub, + 1, + obj->_servant ()), +- ++ + Administration::_nil ()); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::Administration (stub, 0, obj->_servant ()), Administration::_nil ()); + return default_proxy; + } +- else ++ else + return + ACE_reinterpret_cast + ( +@@ -3406,7 +3407,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -3476,7 +3477,7 @@ + { + return; + } +- ++ + ACE_THROW (CORBA::MARSHAL ()); + } + +@@ -3489,7 +3490,7 @@ + { + return; + } +- ++ + ACE_THROW (CORBA::MARSHAL ()); + } + +@@ -3505,28 +3506,28 @@ + { + TAO_ENCAP_BYTE_ORDER, // byte order + 66, +- 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 (0x696f6e2f), +- ACE_NTOHL (0x416c7265), +- ACE_NTOHL (0x61647952), +- ACE_NTOHL (0x65676973), +- ACE_NTOHL (0x74657265), +- 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 (0x2f41646d), ++ ACE_NTOHL (0x696e6973), ++ ACE_NTOHL (0x74726174), ++ ACE_NTOHL (0x696f6e2f), ++ ACE_NTOHL (0x416c7265), ++ ACE_NTOHL (0x61647952), ++ ACE_NTOHL (0x65676973), ++ ACE_NTOHL (0x74657265), ++ ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/Administration/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 + }; +@@ -3610,7 +3611,7 @@ + { + return; + } +- ++ + ACE_THROW (CORBA::MARSHAL ()); + } + +@@ -3623,7 +3624,7 @@ + { + return; + } +- ++ + ACE_THROW (CORBA::MARSHAL ()); + } + +@@ -3647,32 +3648,32 @@ + { + TAO_ENCAP_BYTE_ORDER, // byte order + 63, +- 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 (0x696f6e2f), +- ACE_NTOHL (0x43616e6e), +- ACE_NTOHL (0x6f744163), +- ACE_NTOHL (0x74697661), +- ACE_NTOHL (0x74653a31), ++ 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 (0x696f6e2f), ++ ACE_NTOHL (0x43616e6e), ++ ACE_NTOHL (0x6f744163), ++ ACE_NTOHL (0x74697661), ++ ACE_NTOHL (0x74653a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/Administration/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 + }; + +@@ -3753,7 +3754,7 @@ + { + return; + } +- ++ + ACE_THROW (CORBA::MARSHAL ()); + } + +@@ -3766,7 +3767,7 @@ + { + return; + } +- ++ + ACE_THROW (CORBA::MARSHAL ()); + } + +@@ -3782,24 +3783,24 @@ + { + TAO_ENCAP_BYTE_ORDER, // byte order + 57, +- 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 (0x696f6e2f), +- ACE_NTOHL (0x4e6f7446), +- ACE_NTOHL (0x6f756e64), +- 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 (0x2f41646d), ++ ACE_NTOHL (0x696e6973), ++ ACE_NTOHL (0x74726174), ++ ACE_NTOHL (0x696f6e2f), ++ ACE_NTOHL (0x4e6f7446), ++ ACE_NTOHL (0x6f756e64), ++ ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0 + 9, +- ACE_NTOHL (0x4e6f7446), +- ACE_NTOHL (0x6f756e64), ++ ACE_NTOHL (0x4e6f7446), ++ ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x0), // name = NotFound + 0, // member count + }; +@@ -3832,10 +3833,10 @@ + ImplementationRepository::Administration::CannotActivate + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.activate_server ( + this, + server, +@@ -3853,10 +3854,10 @@ + ImplementationRepository::Administration::AlreadyRegistered + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.register_server ( + this, + server, +@@ -3874,10 +3875,10 @@ + CORBA::SystemException + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.reregister_server ( + this, + server, +@@ -3895,10 +3896,10 @@ + ImplementationRepository::Administration::NotFound + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.remove_server ( + this, + server, +@@ -3915,10 +3916,10 @@ + ImplementationRepository::Administration::NotFound + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.shutdown_server ( + this, + server, +@@ -3937,10 +3938,10 @@ + ImplementationRepository::Administration::NotFound + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return proxy.server_is_running ( + this, + server, +@@ -3959,10 +3960,10 @@ + ImplementationRepository::Administration::NotFound + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.server_is_shutting_down ( + this, + server, +@@ -3980,10 +3981,10 @@ + ImplementationRepository::Administration::NotFound + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.find ( + this, + server, +@@ -4002,10 +4003,10 @@ + CORBA::SystemException + )) + { +- _TAO_Administration_Proxy_Impl &proxy = ++ _TAO_Administration_Proxy_Impl &proxy = + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.list ( + this, + how_many, +@@ -4021,7 +4022,7 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +@@ -4035,14 +4036,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4054,15 +4055,15 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, + {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + }; +- ++ + exception_list->length (2); + for (CORBA::ULong i = 0; i < 2; ++i) + { +@@ -4075,7 +4076,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4084,7 +4085,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4093,7 +4094,7 @@ + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server), +@@ -4108,20 +4109,20 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; +- ++ + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4133,14 +4134,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -4153,7 +4154,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4162,7 +4163,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4171,7 +4172,7 @@ + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server), +@@ -4186,20 +4187,20 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; +- ++ + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4211,12 +4212,12 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4225,7 +4226,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4233,7 +4234,7 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +@@ -4247,14 +4248,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4266,14 +4267,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -4286,7 +4287,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4295,7 +4296,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4303,7 +4304,7 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +@@ -4317,14 +4318,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4336,14 +4337,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -4356,7 +4357,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4365,7 +4366,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4375,7 +4376,7 @@ + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server), +@@ -4391,25 +4392,25 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_addr = parameter_list->length (); + parameter_list->length (length_addr + 1); + (*parameter_list)[length_addr].argument <<= addr_; + (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_server_object = parameter_list->length (); + parameter_list->length (length_server_object + 1); + (*parameter_list)[length_server_object].argument <<= this->server_object_; +- ++ + (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4421,14 +4422,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -4441,7 +4442,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4450,17 +4451,17 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Any_var safe_result_any = result_any; +- ++ + (*result_any) <<= this->_result; + return safe_result_any._retn (); + } + +-void ++void + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) + { +- // update the result ++ // update the result + this->_result = result; + } + +@@ -4468,7 +4469,7 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +@@ -4482,14 +4483,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4501,14 +4502,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -4521,7 +4522,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4530,7 +4531,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4538,7 +4539,7 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + server_ (server) +@@ -4552,14 +4553,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4571,14 +4572,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -4591,7 +4592,7 @@ + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4600,16 +4601,16 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- const CORBA::ULong & how_many ++ const CORBA::ULong & how_many + , +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + how_many_ (how_many) +@@ -4624,14 +4625,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; +- ++ + + return safe_parameter_list._retn (); + } +@@ -4644,12 +4645,12 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4658,7 +4659,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -4667,22 +4668,22 @@ + { + 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 + }; + +@@ -4701,7 +4702,7 @@ + + + /////////////////////////////////////////////////////////////////////// +-// Base & Remote Proxy Implementation. ++// Base & Remote Proxy Implementation. + // + + ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void) +@@ -4722,15 +4723,15 @@ + CORBA::SystemException + )) + { +- ++ + CORBA::Boolean _tao_retval = 0; +- +- ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); + +- ++ + ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, 0); + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, +@@ -4744,13 +4745,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( + &_tao_call, +@@ -4759,17 +4760,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK_RETURN (_tao_retval); +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -4777,35 +4778,35 @@ + ) + ); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); +- ++ + TAO_OutputCDR &_tao_out = _tao_call.out_stream (); + if (!( +- (_tao_out << how_many) ++ (_tao_out << how_many) + )) + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::MARSHAL (), + _tao_retval + ); +- ++ + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + _tao_retval + ); +- ++ + } +- ++ + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) && +@@ -4816,14 +4817,14 @@ + CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), + _tao_retval + ); +- ++ + } +- ++ + TAO_INTERCEPTOR ( + CORBA::Boolean _tao_retval_info = _tao_retval; + ri.result (_tao_retval_info); + ); +- ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -4840,10 +4841,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -4851,8 +4852,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -4871,7 +4872,7 @@ + } + ACE_ENDTRY; + ACE_CHECK_RETURN (_tao_retval); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -4879,7 +4880,7 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } + return _tao_retval; +@@ -4893,15 +4894,15 @@ + CORBA::SystemException + )) + { +- + +- +- ++ ++ ++ + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); + if (istub == 0) + ACE_THROW (CORBA::INTERNAL ()); + +- ++ + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "destroy", +@@ -4914,13 +4915,13 @@ + TAO_ClientRequestInterceptor_Adapter _tao_vfr ( + istub->orb_core ()->client_request_interceptors () + ); +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + for (;;) + { + int _invoke_status = TAO_INVOKE_EXCEPTION; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( + &_tao_call, +@@ -4928,17 +4929,17 @@ + ACE_TRY_ENV + ); + ACE_CHECK; +- ++ + ACE_TRY + { + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_call.start (ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; + TAO_INTERCEPTOR (ri.response_expected (1)); +- ++ + TAO_INTERCEPTOR ( + _tao_vfr.send_request ( + &ri, +@@ -4946,7 +4947,7 @@ + ) + ); + TAO_INTERCEPTOR_CHECK; +- ++ + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag), + ACE_TRY_ENV +@@ -4955,16 +4956,16 @@ + _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + TAO_INTERCEPTOR_CHECK; +- ++ + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES) + ); +- ++ + } +- +- ++ ++ + TAO_INTERCEPTOR ( + ri.reply_status (_invoke_status); + if (_invoke_status == TAO_INVOKE_OK) +@@ -4981,10 +4982,10 @@ + ACE_TRY_ENV + ); + } +- ++ + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if TAO_HAS_INTERCEPTORS == 1 + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) +@@ -4992,8 +4993,8 @@ + _invoke_status = + _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; +- +- ri.forward_reference (exc); ++ ++ ri.forward_reference (exc); + _tao_vfr.receive_other ( + &ri, + ACE_TRY_ENV +@@ -5012,7 +5013,7 @@ + } + ACE_ENDTRY; + ACE_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + if (_invoke_status == TAO_INVOKE_RESTART) +@@ -5020,15 +5021,15 @@ + _tao_call.restart_flag (1); + continue; + } +- ++ + break; + } +- ++ + } + + + // +-// End Base & Remote Proxy Implemeentation. ++// End Base & Remote Proxy Implemeentation. + /////////////////////////////////////////////////////////////////////// + + +@@ -5149,14 +5150,14 @@ + stub, + 1, + obj->_servant ()), +- ++ + ServerInformationIterator::_nil ()); + } + if (CORBA::is_nil (default_proxy)) + ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerInformationIterator (stub, 0, obj->_servant ()), ServerInformationIterator::_nil ()); + return default_proxy; + } +- else ++ else + return + ACE_reinterpret_cast + ( +@@ -5200,7 +5201,7 @@ + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + retv = ACE_reinterpret_cast (void *, + ACE_static_cast (CORBA::Object_ptr, this)); +- ++ + if (retv) + this->_add_ref (); + return retv; +@@ -5220,10 +5221,10 @@ + CORBA::SystemException + )) + { +- _TAO_ServerInformationIterator_Proxy_Impl &proxy = ++ _TAO_ServerInformationIterator_Proxy_Impl &proxy = + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return proxy.next_n ( + this, + how_many, +@@ -5239,10 +5240,10 @@ + CORBA::SystemException + )) + { +- _TAO_ServerInformationIterator_Proxy_Impl &proxy = ++ _TAO_ServerInformationIterator_Proxy_Impl &proxy = + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK; +- ++ + proxy.destroy ( + this, + ACE_TRY_ENV +@@ -5255,7 +5256,7 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const CORBA::ULong & how_many, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target), + how_many_ (how_many) +@@ -5269,14 +5270,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -5288,12 +5289,12 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -5302,24 +5303,24 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Any_var safe_result_any = result_any; +- ++ + (*result_any) <<= CORBA::Any::from_boolean (this->_result); + return safe_result_any._retn (); + } + +-void ++void + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) + { +- // update the result ++ // update the result + this->_result = result; + } + + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- CORBA::Environment & ++ CORBA::Environment & + ) + : TAO_ClientRequestInfo (_tao_invocation, _tao_target) + {} +@@ -5332,7 +5333,7 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return parameter_list; + } + +@@ -5344,12 +5345,12 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + + +-CORBA::Any * ++CORBA::Any * + ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -5358,7 +5359,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -5367,28 +5368,28 @@ + { + 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 + }; + +@@ -5411,7 +5412,7 @@ + if (stream << _tao_elem) + { + _tao_any._tao_replace ( +- ImplementationRepository::_tc_ServerObject, ++ ImplementationRepository::_tc_ServerObject, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, +@@ -5427,13 +5428,13 @@ + { + _tao_elem = ImplementationRepository::ServerObject::_nil (); + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () +@@ -5502,13 +5503,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( +@@ -5593,13 +5594,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( +@@ -5656,13 +5657,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () +@@ -5716,13 +5717,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( +@@ -5799,13 +5800,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( +@@ -5890,13 +5891,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( +@@ -5943,7 +5944,7 @@ + if (stream << _tao_elem) + { + _tao_any._tao_replace ( +- ImplementationRepository::_tc_Administration, ++ ImplementationRepository::_tc_Administration, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, +@@ -5959,13 +5960,13 @@ + { + _tao_elem = ImplementationRepository::Administration::_nil (); + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () +@@ -6037,13 +6038,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value (); +@@ -6127,13 +6128,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value (); +@@ -6217,13 +6218,13 @@ + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + if (_tao_any.any_owns_data ()) + { + _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value (); +@@ -6274,7 +6275,7 @@ + if (stream << _tao_elem) + { + _tao_any._tao_replace ( +- ImplementationRepository::_tc_ServerInformationIterator, ++ ImplementationRepository::_tc_ServerInformationIterator, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, +@@ -6290,13 +6291,13 @@ + { + _tao_elem = ImplementationRepository::ServerInformationIterator::_nil (); + CORBA::TypeCode_var type = _tao_any.type (); +- ++ + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + if (!result) + return 0; // not equivalent +- ++ + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () +@@ -6358,7 +6359,7 @@ + // 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; +@@ -6400,7 +6401,7 @@ + // 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; +@@ -6412,4 +6413,3 @@ + } + return 0; // error + } +- diff --git a/TAO/tao/diffs/ImplRepoC.h.diff b/TAO/tao/diffs/ImplRepoC.h.diff new file mode 100644 index 00000000000..a57a1edd2c7 --- /dev/null +++ b/TAO/tao/diffs/ImplRepoC.h.diff @@ -0,0 +1,1796 @@ +--- orig/ImplRepoC.h Sun Apr 1 16:33:08 2001 ++++ ImplRepoC.h Sun Apr 1 17:47:31 2001 +@@ -23,7 +23,11 @@ + #define _TAO_IDL_ORIG_IMPLREPOC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" ++#include "tao/CDR.h" ++#include "tao/Any.h" ++#include "tao/Object.h" ++#include "tao/ClientRequestInfo.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once +@@ -62,7 +66,7 @@ + + class ServerObject; + typedef ServerObject *ServerObject_ptr; +- ++ + #endif /* end #if !defined */ + + +@@ -73,17 +77,17 @@ + { + public: + ServerObject_var (void); // default constructor +- ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} ++ ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} + ServerObject_var (const ServerObject_var &); // copy constructor + ~ServerObject_var (void); // destructor +- ++ + ServerObject_var &operator= (ServerObject_ptr); + ServerObject_var &operator= (const ServerObject_var &); + ServerObject_ptr operator-> (void) const; +- ++ + operator const ServerObject_ptr &() const; + operator ServerObject_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ServerObject_ptr in (void) const; + ServerObject_ptr &inout (void); + ServerObject_ptr &out (void); +@@ -116,7 +120,7 @@ + operator ServerObject_ptr &(); + ServerObject_ptr &ptr (void); + ServerObject_ptr operator-> (void); +- ++ + private: + ServerObject_ptr &ptr_; + }; +@@ -133,7 +137,7 @@ + class _TAO_ServerObject_Remote_Proxy_Impl; + class _TAO_ServerObject_Proxy_Broker; + class _TAO_ServerObject_Remote_Proxy_Broker; +- ++ + class TAO_PortableServer_Export ServerObject : public virtual CORBA_Object + { + public: +@@ -146,12 +150,12 @@ + static ServerObject_ptr _duplicate (ServerObject_ptr obj); + static ServerObject_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ServerObject_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ServerObject_ptr _nil (void) +@@ -162,7 +166,7 @@ + static void _tao_any_destructor (void*); + + virtual void ping ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -170,7 +174,7 @@ + )); + + virtual void shutdown ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -178,39 +182,39 @@ + )); + + virtual CORBA::Boolean _is_a ( +- const CORBA::Char *type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ const CORBA::Char *type_id, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + private: + _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_; +- ++ + protected: + ServerObject (int collocated = 0); +- ++ + protected: + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated); +- ++ + ServerObject ( +- TAO_Stub *objref, ++ TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); +- ++ + friend class _TAO_ServerObject_Remote_Proxy_Impl; + friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; + friend class _TAO_ServerObject_Direct_Proxy_Impl; +- ++ + virtual ~ServerObject (void); + private: + ServerObject (const ServerObject &); +- void operator= (const ServerObject &); ++ void operator= (const ServerObject &); + + #if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. +@@ -221,80 +225,80 @@ + { + public: + friend class ImplementationRepository::ServerObject; +- ++ + friend class _TAO_ServerObject_Remote_Proxy_Impl; + friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; + friend class _TAO_ServerObject_Direct_Proxy_Impl; +- ++ + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &); +- ++ + }; +- ++ + class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::ServerObject; +- ++ + friend class _TAO_ServerObject_Remote_Proxy_Impl; + friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; + friend class _TAO_ServerObject_Direct_Proxy_Impl; +- ++ + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &); +- ++ + }; + + #endif /* TAO_HAS_INTERCEPTORS */ +@@ -315,7 +319,7 @@ + { + public: + virtual ~_TAO_ServerObject_Proxy_Impl (void) { } +- ++ + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV +@@ -345,15 +349,15 @@ + // Remote Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : + public virtual _TAO_ServerObject_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl + { + public: + _TAO_ServerObject_Remote_Proxy_Impl (void); +- ++ + virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { } +- ++ + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV +@@ -378,14 +382,14 @@ + + + // The Proxy Brokers are used by each interface to get +-// the right proxy for performing a call. In the new ++// the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on +-// a call by call basis. ++// a call by call basis. + + + + /////////////////////////////////////////////////////////////////////// +-// Base Proxy Broker Declaration ++// Base Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker +@@ -399,25 +403,25 @@ + + protected: + _TAO_ServerObject_Proxy_Broker (void); +- ++ + }; + + // +-// End Base Proxy Broker Declaration ++// End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// +-// Remote Proxy Broker Declaration ++// Remote Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker : public virtual _TAO_ServerObject_Proxy_Broker + { +-public: ++public: + _TAO_ServerObject_Remote_Proxy_Broker (void); +- ++ + virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void); +- ++ + virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( + ServerObject *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () +@@ -435,7 +439,7 @@ + + + // +-// End Remote Proxy Broker Declaration ++// End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + +@@ -466,18 +470,18 @@ + EnvironmentVariable_var (EnvironmentVariable *); + EnvironmentVariable_var (const EnvironmentVariable_var &); // copy constructor + ~EnvironmentVariable_var (void); // destructor +- ++ + EnvironmentVariable_var &operator= (EnvironmentVariable *); + EnvironmentVariable_var &operator= (const EnvironmentVariable_var &); + EnvironmentVariable *operator-> (void); + const EnvironmentVariable *operator-> (void) const; +- ++ + operator const EnvironmentVariable &() const; + operator EnvironmentVariable &(); + operator EnvironmentVariable &() const; + operator EnvironmentVariable *&(); // variable-size types only +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const EnvironmentVariable &in (void) const; + EnvironmentVariable &inout (void); + EnvironmentVariable *&out (void); +@@ -499,7 +503,7 @@ + operator EnvironmentVariable *&(); + EnvironmentVariable *&ptr (void); + EnvironmentVariable *operator-> (void); +- ++ + private: + EnvironmentVariable *&ptr_; + // assignment from T_var not allowed +@@ -515,7 +519,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) + #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ + +@@ -523,9 +527,9 @@ + { + public: + // = Initialization and termination methods. +- ++ + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Default constructor. +- _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); ++ _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum, + CORBA::ULong length, + EnvironmentVariable *data, +@@ -542,7 +546,7 @@ + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) +- ++ + EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0); + const EnvironmentVariable *get_buffer (void) const; + void replace (CORBA::ULong max, +@@ -554,7 +558,7 @@ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) + #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ +@@ -566,20 +570,20 @@ + // EnvironmentList + // ************************************************************* + +-class TAO_PortableServer_Export EnvironmentList : public ++class TAO_PortableServer_Export EnvironmentList : public + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<EnvironmentVariable> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + EnvironmentList (void); // default ctor + EnvironmentList (CORBA::ULong max); // uses max size + EnvironmentList ( +- CORBA::ULong max, +- CORBA::ULong length, +- EnvironmentVariable *buffer, ++ CORBA::ULong max, ++ CORBA::ULong length, ++ EnvironmentVariable *buffer, + CORBA::Boolean release = 0 + ); + EnvironmentList (const EnvironmentList &); // copy ctor +@@ -609,21 +613,21 @@ + EnvironmentList_var (EnvironmentList *); + EnvironmentList_var (const EnvironmentList_var &); // copy constructor + ~EnvironmentList_var (void); // destructor +- ++ + EnvironmentList_var &operator= (EnvironmentList *); + EnvironmentList_var &operator= (const EnvironmentList_var &); + EnvironmentList *operator-> (void); + const EnvironmentList *operator-> (void) const; +- ++ + operator const EnvironmentList &() const; + operator EnvironmentList &(); + operator EnvironmentList &() const; + operator EnvironmentList *&(); // variable-size base types only +- ++ + EnvironmentVariable & operator[] (CORBA::ULong index); + const EnvironmentVariable & operator[] (CORBA::ULong index) const; +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const EnvironmentList &in (void) const; + EnvironmentList &inout (void); + EnvironmentList *&out (void); +@@ -653,7 +657,7 @@ + EnvironmentList *&ptr (void); + EnvironmentList *operator-> (void); + EnvironmentVariable & operator[] (CORBA::ULong index); +- ++ + private: + EnvironmentList *&ptr_; + // assignment from T_var not allowed +@@ -670,7 +674,7 @@ + NORMAL, + MANUAL, + PER_CLIENT, +- AUTO_START ++ AUTO_START + }; + typedef ActivationMode &ActivationMode_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode; +@@ -700,18 +704,18 @@ + StartupOptions_var (StartupOptions *); + StartupOptions_var (const StartupOptions_var &); // copy constructor + ~StartupOptions_var (void); // destructor +- ++ + StartupOptions_var &operator= (StartupOptions *); + StartupOptions_var &operator= (const StartupOptions_var &); + StartupOptions *operator-> (void); + const StartupOptions *operator-> (void) const; +- ++ + operator const StartupOptions &() const; + operator StartupOptions &(); + operator StartupOptions &() const; + operator StartupOptions *&(); // variable-size types only +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const StartupOptions &in (void) const; + StartupOptions &inout (void); + StartupOptions *&out (void); +@@ -733,7 +737,7 @@ + operator StartupOptions *&(); + StartupOptions *&ptr (void); + StartupOptions *operator-> (void); +- ++ + private: + StartupOptions *&ptr_; + // assignment from T_var not allowed +@@ -767,18 +771,18 @@ + ServerInformation_var (ServerInformation *); + ServerInformation_var (const ServerInformation_var &); // copy constructor + ~ServerInformation_var (void); // destructor +- ++ + ServerInformation_var &operator= (ServerInformation *); + ServerInformation_var &operator= (const ServerInformation_var &); + ServerInformation *operator-> (void); + const ServerInformation *operator-> (void) const; +- ++ + operator const ServerInformation &() const; + operator ServerInformation &(); + operator ServerInformation &() const; + operator ServerInformation *&(); // variable-size types only +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const ServerInformation &in (void) const; + ServerInformation &inout (void); + ServerInformation *&out (void); +@@ -800,7 +804,7 @@ + operator ServerInformation *&(); + ServerInformation *&ptr (void); + ServerInformation *operator-> (void); +- ++ + private: + ServerInformation *&ptr_; + // assignment from T_var not allowed +@@ -811,7 +815,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) + #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ + +@@ -819,9 +823,9 @@ + { + public: + // = Initialization and termination methods. +- ++ + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Default constructor. +- _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); ++ _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum, + CORBA::ULong length, + ServerInformation *data, +@@ -838,7 +842,7 @@ + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) +- ++ + ServerInformation *get_buffer (CORBA::Boolean orphan = 0); + const ServerInformation *get_buffer (void) const; + void replace (CORBA::ULong max, +@@ -850,7 +854,7 @@ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) + #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ +@@ -862,20 +866,20 @@ + // ServerInformationList + // ************************************************************* + +-class TAO_PortableServer_Export ServerInformationList : public ++class TAO_PortableServer_Export ServerInformationList : public + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList + #else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ServerInformation> +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + ServerInformationList (void); // default ctor + ServerInformationList (CORBA::ULong max); // uses max size + ServerInformationList ( +- CORBA::ULong max, +- CORBA::ULong length, +- ServerInformation *buffer, ++ CORBA::ULong max, ++ CORBA::ULong length, ++ ServerInformation *buffer, + CORBA::Boolean release = 0 + ); + ServerInformationList (const ServerInformationList &); // copy ctor +@@ -905,21 +909,21 @@ + ServerInformationList_var (ServerInformationList *); + ServerInformationList_var (const ServerInformationList_var &); // copy constructor + ~ServerInformationList_var (void); // destructor +- ++ + ServerInformationList_var &operator= (ServerInformationList *); + ServerInformationList_var &operator= (const ServerInformationList_var &); + ServerInformationList *operator-> (void); + const ServerInformationList *operator-> (void) const; +- ++ + operator const ServerInformationList &() const; + operator ServerInformationList &(); + operator ServerInformationList &() const; + operator ServerInformationList *&(); // variable-size base types only +- ++ + ServerInformation & operator[] (CORBA::ULong index); + const ServerInformation & operator[] (CORBA::ULong index) const; +- +- // in, inout, out, _retn ++ ++ // in, inout, out, _retn + const ServerInformationList &in (void) const; + ServerInformationList &inout (void); + ServerInformationList *&out (void); +@@ -949,7 +953,7 @@ + ServerInformationList *&ptr (void); + ServerInformationList *operator-> (void); + ServerInformation & operator[] (CORBA::ULong index); +- ++ + private: + ServerInformationList *&ptr_; + // assignment from T_var not allowed +@@ -978,17 +982,17 @@ + { + public: + ServerInformationIterator_var (void); // default constructor +- ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} ++ ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} + ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor + ~ServerInformationIterator_var (void); // destructor +- ++ + ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); + ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); + ServerInformationIterator_ptr operator-> (void) const; +- ++ + operator const ServerInformationIterator_ptr &() const; + operator ServerInformationIterator_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ServerInformationIterator_ptr in (void) const; + ServerInformationIterator_ptr &inout (void); + ServerInformationIterator_ptr &out (void); +@@ -1021,7 +1025,7 @@ + operator ServerInformationIterator_ptr &(); + ServerInformationIterator_ptr &ptr (void); + ServerInformationIterator_ptr operator-> (void); +- ++ + private: + ServerInformationIterator_ptr &ptr_; + }; +@@ -1046,17 +1050,17 @@ + { + public: + Administration_var (void); // default constructor +- Administration_var (Administration_ptr p) : ptr_ (p) {} ++ Administration_var (Administration_ptr p) : ptr_ (p) {} + Administration_var (const Administration_var &); // copy constructor + ~Administration_var (void); // destructor +- ++ + Administration_var &operator= (Administration_ptr); + Administration_var &operator= (const Administration_var &); + Administration_ptr operator-> (void) const; +- ++ + operator const Administration_ptr &() const; + operator Administration_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + Administration_ptr in (void) const; + Administration_ptr &inout (void); + Administration_ptr &out (void); +@@ -1089,7 +1093,7 @@ + operator Administration_ptr &(); + Administration_ptr &ptr (void); + Administration_ptr operator-> (void); +- ++ + private: + Administration_ptr &ptr_; + }; +@@ -1119,12 +1123,12 @@ + static Administration_ptr _duplicate (Administration_ptr obj); + static Administration_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static Administration_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static Administration_ptr _nil (void) +@@ -1144,29 +1148,29 @@ + + AlreadyRegistered (void); + // Default constructor. +- ++ + AlreadyRegistered (const AlreadyRegistered &); + // Copy constructor. +- ++ + ~AlreadyRegistered (void); + // Destructor. +- ++ + static void _tao_any_destructor (void*); +- ++ + AlreadyRegistered &operator= (const AlreadyRegistered &); +- ++ + virtual void _raise (void); + + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; +- ++ + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & + ); +- ++ + static AlreadyRegistered *_downcast (CORBA::Exception *); + + +@@ -1191,35 +1195,35 @@ + + CannotActivate (void); + // Default constructor. +- ++ + CannotActivate (const CannotActivate &); + // Copy constructor. +- ++ + ~CannotActivate (void); + // Destructor. +- ++ + static void _tao_any_destructor (void*); +- ++ + CannotActivate &operator= (const CannotActivate &); +- ++ + virtual void _raise (void); + + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; +- ++ + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & + ); +- ++ + static CannotActivate *_downcast (CORBA::Exception *); + + CannotActivate ( + const char * _tao_reason + ); +- ++ + // = TAO extension. + static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; +@@ -1240,29 +1244,29 @@ + + NotFound (void); + // Default constructor. +- ++ + NotFound (const NotFound &); + // Copy constructor. +- ++ + ~NotFound (void); + // Destructor. +- ++ + static void _tao_any_destructor (void*); +- ++ + NotFound &operator= (const NotFound &); +- ++ + virtual void _raise (void); + + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; +- ++ + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & + ); +- ++ + static NotFound *_downcast (CORBA::Exception *); + + +@@ -1278,7 +1282,7 @@ + + virtual void activate_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1290,7 +1294,7 @@ + virtual void register_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1301,7 +1305,7 @@ + virtual void reregister_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1310,7 +1314,7 @@ + + virtual void remove_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1320,7 +1324,7 @@ + + virtual void shutdown_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1332,7 +1336,7 @@ + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1342,7 +1346,7 @@ + + virtual void server_is_shutting_down ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1353,7 +1357,7 @@ + virtual void find ( + const char * server, + ImplementationRepository::ServerInformation_out info, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1365,7 +1369,7 @@ + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1373,39 +1377,39 @@ + )); + + virtual CORBA::Boolean _is_a ( +- const CORBA::Char *type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ const CORBA::Char *type_id, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + private: + _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_; +- ++ + protected: + Administration (int collocated = 0); +- ++ + protected: + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_Administration_setup_collocation (int collocated); +- ++ + Administration ( +- TAO_Stub *objref, ++ TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +- ++ + virtual ~Administration (void); + private: + Administration (const Administration &); +- void operator= (const Administration &); ++ void operator= (const Administration &); + + #if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. +@@ -1416,49 +1420,49 @@ + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +- ++ + TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &); + const char * server_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1468,24 +1472,24 @@ + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1495,14 +1499,14 @@ + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &); + const char * server_; + const ImplementationRepository::StartupOptions & options_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1512,24 +1516,24 @@ + CORBA::Object_ptr _tao_target, + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1539,14 +1543,14 @@ + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &); + const char * server_; + const ImplementationRepository::StartupOptions & options_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1555,24 +1559,24 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1581,14 +1585,14 @@ + TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &); + const char * server_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1597,24 +1601,24 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1623,14 +1627,14 @@ + TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &); + const char * server_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1641,24 +1645,24 @@ + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1670,7 +1674,7 @@ + const char * addr_; + ImplementationRepository::ServerObject_ptr server_object_; + void result (char * result); +- // update the result ++ // update the result + char * _result; + }; + +@@ -1678,7 +1682,7 @@ + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1687,24 +1691,24 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1713,14 +1717,14 @@ + TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); + const char * server_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1729,24 +1733,24 @@ + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1755,14 +1759,14 @@ + TAO_ClientRequestInfo_ImplementationRepository_Administration_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &); + const char * server_; +- ++ + }; + + class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo + { + public: + friend class ImplementationRepository::Administration; +- ++ + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; +@@ -1770,26 +1774,26 @@ + TAO_ClientRequestInfo_ImplementationRepository_Administration_list ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- const CORBA::ULong & how_many ++ const CORBA::ULong & how_many + , +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -1798,7 +1802,7 @@ + TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &); + const CORBA::ULong & how_many_; +- ++ + + }; + +@@ -1820,7 +1824,7 @@ + { + public: + virtual ~_TAO_Administration_Proxy_Impl (void) { } +- ++ + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, +@@ -1930,15 +1934,15 @@ + // Remote Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl : + public virtual _TAO_Administration_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl + { + public: + _TAO_Administration_Remote_Proxy_Impl (void); +- ++ + virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { } +- ++ + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, +@@ -2043,14 +2047,14 @@ + + + // The Proxy Brokers are used by each interface to get +-// the right proxy for performing a call. In the new ++// the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on +-// a call by call basis. ++// a call by call basis. + + + + /////////////////////////////////////////////////////////////////////// +-// Base Proxy Broker Declaration ++// Base Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker +@@ -2064,25 +2068,25 @@ + + protected: + _TAO_Administration_Proxy_Broker (void); +- ++ + }; + + // +-// End Base Proxy Broker Declaration ++// End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// +-// Remote Proxy Broker Declaration ++// Remote Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker : public virtual _TAO_Administration_Proxy_Broker + { +-public: ++public: + _TAO_Administration_Remote_Proxy_Broker (void); +- ++ + virtual ~_TAO_Administration_Remote_Proxy_Broker (void); +- ++ + virtual _TAO_Administration_Proxy_Impl &select_proxy ( + Administration *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () +@@ -2100,7 +2104,7 @@ + + + // +-// End Remote Proxy Broker Declaration ++// End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + +@@ -2125,17 +2129,17 @@ + { + public: + ServerInformationIterator_var (void); // default constructor +- ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} ++ ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} + ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor + ~ServerInformationIterator_var (void); // destructor +- ++ + ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); + ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); + ServerInformationIterator_ptr operator-> (void) const; +- ++ + operator const ServerInformationIterator_ptr &() const; + operator ServerInformationIterator_ptr &(); +- // in, inout, out, _retn ++ // in, inout, out, _retn + ServerInformationIterator_ptr in (void) const; + ServerInformationIterator_ptr &inout (void); + ServerInformationIterator_ptr &out (void); +@@ -2168,7 +2172,7 @@ + operator ServerInformationIterator_ptr &(); + ServerInformationIterator_ptr &ptr (void); + ServerInformationIterator_ptr operator-> (void); +- ++ + private: + ServerInformationIterator_ptr &ptr_; + }; +@@ -2198,12 +2202,12 @@ + static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); + static ServerInformationIterator_ptr _narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ServerInformationIterator_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static ServerInformationIterator_ptr _nil (void) +@@ -2216,7 +2220,7 @@ + virtual CORBA::Boolean next_n ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -2224,7 +2228,7 @@ + )); + + virtual void destroy ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -2232,39 +2236,39 @@ + )); + + virtual CORBA::Boolean _is_a ( +- const CORBA::Char *type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ const CORBA::Char *type_id, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + virtual void *_tao_QueryInterface (ptr_arith_t type); +- ++ + virtual const char* _interface_repository_id (void) const; + + private: + _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_; +- ++ + protected: + ServerInformationIterator (int collocated = 0); +- ++ + protected: + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated); +- ++ + ServerInformationIterator ( +- TAO_Stub *objref, ++ TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); +- ++ + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; +- ++ + virtual ~ServerInformationIterator (void); + private: + ServerInformationIterator (const ServerInformationIterator &); +- void operator= (const ServerInformationIterator &); ++ void operator= (const ServerInformationIterator &); + + #if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. +@@ -2275,43 +2279,43 @@ + { + public: + friend class ImplementationRepository::ServerInformationIterator; +- ++ + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; +- ++ + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, + const CORBA::ULong & how_many, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); +- ++ + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + const CORBA::ULong & how_many_; + void result (CORBA::Boolean result); +- // update the result ++ // update the result + CORBA::Boolean _result; + }; + +@@ -2319,7 +2323,7 @@ + { + public: + friend class ImplementationRepository::ServerInformationIterator; +- ++ + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; +@@ -2327,24 +2331,24 @@ + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_GIOP_Invocation *_tao_invocation, + CORBA::Object_ptr _tao_target, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual Dynamic::ParameterList * arguments ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual Dynamic::ExceptionList * exceptions ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Any * result ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +@@ -2352,7 +2356,7 @@ + private: + TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); + void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); +- ++ + }; + + #endif /* TAO_HAS_INTERCEPTORS */ +@@ -2373,7 +2377,7 @@ + { + public: + virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { } +- ++ + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, +@@ -2405,15 +2409,15 @@ + // Remote Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl : + public virtual _TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl + { + public: + _TAO_ServerInformationIterator_Remote_Proxy_Impl (void); +- ++ + virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { } +- ++ + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, +@@ -2440,14 +2444,14 @@ + + + // The Proxy Brokers are used by each interface to get +-// the right proxy for performing a call. In the new ++// the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on +-// a call by call basis. ++// a call by call basis. + + + + /////////////////////////////////////////////////////////////////////// +-// Base Proxy Broker Declaration ++// Base Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker +@@ -2461,25 +2465,25 @@ + + protected: + _TAO_ServerInformationIterator_Proxy_Broker (void); +- ++ + }; + + // +-// End Base Proxy Broker Declaration ++// End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// +-// Remote Proxy Broker Declaration ++// Remote Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker : public virtual _TAO_ServerInformationIterator_Proxy_Broker + { +-public: ++public: + _TAO_ServerInformationIterator_Remote_Proxy_Broker (void); +- ++ + virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); +- ++ + virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () +@@ -2497,7 +2501,7 @@ + + + // +-// End Remote Proxy Broker Declaration ++// End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + +@@ -2588,7 +2592,7 @@ + + #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */ + +-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // ++TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // + TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &); + TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &); + TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &); diff --git a/TAO/tao/diffs/ImplRepoC.i.diff b/TAO/tao/diffs/ImplRepoC.i.diff new file mode 100644 index 00000000000..ead551b5f09 --- /dev/null +++ b/TAO/tao/diffs/ImplRepoC.i.diff @@ -0,0 +1,814 @@ +--- orig/ImplRepoC.i Sun Apr 1 16:33:08 2001 ++++ ImplRepoC.i Sun Apr 1 17:47:35 2001 +@@ -86,14 +86,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast ++ACE_INLINE ++ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast + { + return this->ptr_; + } +@@ -185,7 +185,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast + { + return this->ptr_; +@@ -257,7 +257,7 @@ + { + EnvironmentVariable *deep_copy = + new EnvironmentVariable (*p.ptr_); +- ++ + if (deep_copy != 0) + { + EnvironmentVariable *tmp = deep_copy; +@@ -267,7 +267,7 @@ + } + } + } +- ++ + return *this; + } + +@@ -290,20 +290,20 @@ + } + + ACE_INLINE +-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast ++ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast + { + return *this->ptr_; + } + + ACE_INLINE +-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast ++ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast + { + return *this->ptr_; + } + + // variable-size types only + ACE_INLINE +-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast ++ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast + { + return this->ptr_; + } +@@ -320,7 +320,7 @@ + return *this->ptr_; + } + +-// mapping for variable size ++// mapping for variable size + ACE_INLINE ::ImplementationRepository::EnvironmentVariable *& + ImplementationRepository::EnvironmentVariable_var::out (void) + { +@@ -381,7 +381,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast + { + return this->ptr_; +@@ -401,7 +401,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_) + #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_ + +@@ -414,24 +414,24 @@ + ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0); + return retval; + } +- ++ + ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer) + // Free the sequence. + { + delete [] buffer; + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor. + { + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum)) + { + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum, + CORBA::ULong length, +@@ -440,7 +440,7 @@ + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs) + // Copy constructor. +@@ -450,10 +450,10 @@ + { + ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_); + ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; +- ++ + this->buffer_ = tmp1; + } + else +@@ -461,14 +461,14 @@ + this->buffer_ = 0; + } + } +- ++ + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList & + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; +- ++ + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) +@@ -481,18 +481,18 @@ + } + else + this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_); +- ++ + TAO_Unbounded_Base_Sequence::operator= (rhs); +- ++ + ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_); + ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; +- ++ + return *this; + } +- ++ + // = Accessors. + ACE_INLINE ImplementationRepository::EnvironmentVariable & + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) +@@ -502,7 +502,7 @@ + ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_); + return tmp[i]; + } +- ++ + ACE_INLINE const ImplementationRepository::EnvironmentVariable & + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const + // operator [] +@@ -511,9 +511,9 @@ + ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } +- ++ + // Implement the TAO_Base_Sequence methods (see Sequence.h) +- ++ + ACE_INLINE ImplementationRepository::EnvironmentVariable * + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan) + { +@@ -547,13 +547,13 @@ + } + return result; + } +- ++ + ACE_INLINE const ImplementationRepository::EnvironmentVariable * + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const + { + return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_); + } +- ++ + ACE_INLINE void + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max, + CORBA::ULong length, +@@ -570,11 +570,11 @@ + this->buffer_ = data; + this->release_ = release; + } +- ++ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_) + #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_ +@@ -630,7 +630,7 @@ + { + EnvironmentList *deep_copy = + new EnvironmentList (*p.ptr_); +- ++ + if (deep_copy != 0) + { + EnvironmentList *tmp = deep_copy; +@@ -640,7 +640,7 @@ + } + } + } +- ++ + return *this; + } + +@@ -656,27 +656,27 @@ + return this->ptr_; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast + { + return *this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast ++ACE_INLINE ++ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast + { + return *this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast ++ACE_INLINE ++ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast + { + return *this->ptr_; + } + + // variable-size types only + ACE_INLINE +-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast ++ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast + { + return this->ptr_; + } +@@ -705,7 +705,7 @@ + return *this->ptr_; + } + +-// mapping for variable size ++// mapping for variable size + ACE_INLINE ::ImplementationRepository::EnvironmentList *& + ImplementationRepository::EnvironmentList_var::out (void) + { +@@ -766,7 +766,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast + { + return this->ptr_; +@@ -844,7 +844,7 @@ + { + StartupOptions *deep_copy = + new StartupOptions (*p.ptr_); +- ++ + if (deep_copy != 0) + { + StartupOptions *tmp = deep_copy; +@@ -854,7 +854,7 @@ + } + } + } +- ++ + return *this; + } + +@@ -877,20 +877,20 @@ + } + + ACE_INLINE +-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast ++ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast + { + return *this->ptr_; + } + + ACE_INLINE +-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast ++ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast + { + return *this->ptr_; + } + + // variable-size types only + ACE_INLINE +-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast ++ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast + { + return this->ptr_; + } +@@ -907,7 +907,7 @@ + return *this->ptr_; + } + +-// mapping for variable size ++// mapping for variable size + ACE_INLINE ::ImplementationRepository::StartupOptions *& + ImplementationRepository::StartupOptions_var::out (void) + { +@@ -968,7 +968,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast + { + return this->ptr_; +@@ -1037,7 +1037,7 @@ + { + ServerInformation *deep_copy = + new ServerInformation (*p.ptr_); +- ++ + if (deep_copy != 0) + { + ServerInformation *tmp = deep_copy; +@@ -1047,7 +1047,7 @@ + } + } + } +- ++ + return *this; + } + +@@ -1070,20 +1070,20 @@ + } + + ACE_INLINE +-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast ++ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast + { + return *this->ptr_; + } + + ACE_INLINE +-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast ++ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast + { + return *this->ptr_; + } + + // variable-size types only + ACE_INLINE +-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast ++ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast + { + return this->ptr_; + } +@@ -1100,7 +1100,7 @@ + return *this->ptr_; + } + +-// mapping for variable size ++// mapping for variable size + ACE_INLINE ::ImplementationRepository::ServerInformation *& + ImplementationRepository::ServerInformation_var::out (void) + { +@@ -1161,7 +1161,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast + { + return this->ptr_; +@@ -1181,7 +1181,7 @@ + + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) +- ++ + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_) + #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_ + +@@ -1194,24 +1194,24 @@ + ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0); + return retval; + } +- ++ + ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer) + // Free the sequence. + { + delete [] buffer; + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor. + { + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum)) + { + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum, + CORBA::ULong length, +@@ -1220,7 +1220,7 @@ + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } +- ++ + ACE_INLINE + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs) + // Copy constructor. +@@ -1230,10 +1230,10 @@ + { + ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_); + ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; +- ++ + this->buffer_ = tmp1; + } + else +@@ -1241,14 +1241,14 @@ + this->buffer_ = 0; + } + } +- ++ + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList & + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; +- ++ + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) +@@ -1261,18 +1261,18 @@ + } + else + this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_); +- ++ + TAO_Unbounded_Base_Sequence::operator= (rhs); +- ++ + ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_); + ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_); +- ++ + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; +- ++ + return *this; + } +- ++ + // = Accessors. + ACE_INLINE ImplementationRepository::ServerInformation & + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) +@@ -1282,7 +1282,7 @@ + ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_); + return tmp[i]; + } +- ++ + ACE_INLINE const ImplementationRepository::ServerInformation & + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const + // operator [] +@@ -1291,9 +1291,9 @@ + ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } +- ++ + // Implement the TAO_Base_Sequence methods (see Sequence.h) +- ++ + ACE_INLINE ImplementationRepository::ServerInformation * + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan) + { +@@ -1327,13 +1327,13 @@ + } + return result; + } +- ++ + ACE_INLINE const ImplementationRepository::ServerInformation * + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const + { + return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_); + } +- ++ + ACE_INLINE void + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max, + CORBA::ULong length, +@@ -1350,11 +1350,11 @@ + this->buffer_ = data; + this->release_ = release; + } +- ++ + #endif /* end #if !defined */ + + +-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ ++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_) + #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_ +@@ -1410,7 +1410,7 @@ + { + ServerInformationList *deep_copy = + new ServerInformationList (*p.ptr_); +- ++ + if (deep_copy != 0) + { + ServerInformationList *tmp = deep_copy; +@@ -1420,7 +1420,7 @@ + } + } + } +- ++ + return *this; + } + +@@ -1436,27 +1436,27 @@ + return this->ptr_; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast + { + return *this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast ++ACE_INLINE ++ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast + { + return *this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast ++ACE_INLINE ++ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast + { + return *this->ptr_; + } + + // variable-size types only + ACE_INLINE +-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast ++ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast + { + return this->ptr_; + } +@@ -1485,7 +1485,7 @@ + return *this->ptr_; + } + +-// mapping for variable size ++// mapping for variable size + ACE_INLINE ::ImplementationRepository::ServerInformationList *& + ImplementationRepository::ServerInformationList_var::out (void) + { +@@ -1546,7 +1546,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast + { + return this->ptr_; +@@ -1604,7 +1604,7 @@ + : ptr_ (ImplementationRepository::ServerInformationIterator::_nil ()) + {} + +-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr + ImplementationRepository::ServerInformationIterator_var::ptr (void) const + { + return this->ptr_; +@@ -1641,19 +1641,19 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerInformationIterator_var::operator const ImplementationRepository::ServerInformationIterator_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::ServerInformationIterator_var::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast ++ACE_INLINE ++ImplementationRepository::ServerInformationIterator_var::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast + { + return this->ptr_; + } + +-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr + ImplementationRepository::ServerInformationIterator_var::operator-> (void) const + { + return this->ptr_; +@@ -1679,7 +1679,7 @@ + return this->ptr_; + } + +-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr + ImplementationRepository::ServerInformationIterator_var::_retn (void) + { + // yield ownership of managed obj reference +@@ -1740,7 +1740,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::ServerInformationIterator_out::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast + { + return this->ptr_; +@@ -1752,7 +1752,7 @@ + return this->ptr_; + } + +-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr + ImplementationRepository::ServerInformationIterator_out::operator-> (void) + { + return this->ptr_; +@@ -1840,14 +1840,14 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast + { + return this->ptr_; + } + +-ACE_INLINE +-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast ++ACE_INLINE ++ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast + { + return this->ptr_; + } +@@ -1939,7 +1939,7 @@ + return *this; + } + +-ACE_INLINE ++ACE_INLINE + ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast + { + return this->ptr_; +@@ -2018,7 +2018,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate) +@@ -2030,7 +2030,7 @@ + return 1; + else + return 0; +- ++ + } + + +@@ -2058,12 +2058,12 @@ + { + CORBA::ULong _tao_temp = 0; + CORBA::Boolean _tao_result = strm >> _tao_temp; +- ++ + if (_tao_result == 1) + { + _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp); + } +- ++ + return _tao_result; + } + +@@ -2078,7 +2078,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate) +@@ -2092,7 +2092,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate) +@@ -2106,7 +2106,7 @@ + return 1; + else + return 0; +- ++ + } + + ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate) +@@ -2120,7 +2120,7 @@ + return 1; + else + return 0; +- ++ + } + + +@@ -2301,4 +2301,3 @@ + ACE_ENDTRY; + return 0; + } +- diff --git a/TAO/tao/diffs/ImplRepoS.cpp.diff b/TAO/tao/diffs/ImplRepoS.cpp.diff new file mode 100644 index 00000000000..60508b8aa6c --- /dev/null +++ b/TAO/tao/diffs/ImplRepoS.cpp.diff @@ -0,0 +1,2457 @@ +--- orig/ImplRepoS.cpp Sun Apr 1 16:33:09 2001 ++++ ImplRepoS.cpp Sun Apr 1 17:53:26 2001 +@@ -29,6 +29,7 @@ + #include "tao/ORB_Core.h" + #include "tao/Stub.h" + #include "tao/IFR_Client_Adapter.h" ++#include "tao/PortableInterceptor.h" + #include "ace/Dynamic_Service.h" + + #if TAO_HAS_INTERCEPTORS == 1 +@@ -121,10 +122,10 @@ + static const class TAO_operation_db_entry wordlist[] = + { + {"",0},{"",0},{"",0},{"",0}, +- {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, ++ {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, + {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel}, + {"",0},{"",0}, +- {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, ++ {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, + {"",0}, + {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel}, + {"",0},{"",0}, +@@ -164,14 +165,14 @@ + { + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + this->proxy_cache_[i] = 0; +- ++ + } + + POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void) + { + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + delete this->proxy_cache_[i]; +- ++ + } + + ImplementationRepository::_TAO_ServerObject_Proxy_Impl& +@@ -182,25 +183,25 @@ + { + int strategy = + TAO_ORB_Core::collocation_strategy (object); +- ++ + if (this->proxy_cache_[strategy] != 0) + return *this->proxy_cache_[strategy]; +- ++ + this->create_proxy (strategy, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); +- ++ + return *this->proxy_cache_[strategy]; +- ++ + } + +-void ++void + POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy ( + int strategy, + CORBA::Environment &ACE_TRY_ENV + ) + { + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); +- ++ + if (this->proxy_cache_[strategy] == 0) + { + switch (strategy) +@@ -213,7 +214,7 @@ + ); + ACE_CHECK; + break; +- ++ + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], +@@ -222,7 +223,7 @@ + ); + ACE_CHECK; + break; +- ++ + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: + default: + ACE_NEW_THROW_EX ( +@@ -232,9 +233,9 @@ + ); + ACE_CHECK; + break; +- ++ + } +- ++ + } + } + +@@ -255,14 +256,14 @@ + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long _dummy_) + { + ACE_UNUSED_ARG (_dummy_); +- +- ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = ++ ++ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function; +- ++ + return 0; + } + +-static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = ++static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer)); + + +@@ -361,7 +362,7 @@ + )->ping ( + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown ( +@@ -378,7 +379,7 @@ + )->shutdown ( + ACE_TRY_ENV + ); +- ++ + } + + +@@ -403,39 +404,39 @@ + + void POA_ImplementationRepository::ServerObject::ping_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri ( + _tao_server_request, + _tao_impl, + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->ping ( + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -443,7 +444,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -464,48 +465,48 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::ServerObject::shutdown_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( + _tao_server_request, + _tao_impl, + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->shutdown ( + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -513,7 +514,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -534,15 +535,15 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::ServerObject::_is_a_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -554,10 +555,10 @@ + CORBA::String_var value; + if (!(_tao_in >> value.out ())) + ACE_THROW (CORBA::MARSHAL ()); +- ++ + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) +@@ -565,7 +566,7 @@ + } + + void POA_ImplementationRepository::ServerObject::_non_existent_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -574,7 +575,7 @@ + POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) +@@ -582,7 +583,7 @@ + } + + void POA_ImplementationRepository::ServerObject::_interface_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -591,26 +592,26 @@ + POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; + CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::Boolean _tao_result = 0; +- ++ + TAO_IFR_Client_Adapter *_tao_adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); +- ++ + if (_tao_adapter == 0) + { + ACE_THROW (CORBA::INTF_REPOS ()); + } +- ++ + ACE_TRY + { + _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + _tao_result = + _tao_adapter->interfacedef_cdr_insert ( + _tao_out, +@@ -622,7 +623,7 @@ + _tao_adapter->dispose (_tao_retval); + } + ACE_ENDTRY; +- ++ + if (_tao_result == 0) + { + ACE_THROW (CORBA::MARSHAL ()); +@@ -636,7 +637,7 @@ + { + const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + if ( + (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) +@@ -671,14 +672,14 @@ + { + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Object_ptr tmp = CORBA::Object::_nil (); +- ++ + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); + else + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); +- ++ + CORBA::Object_var obj = tmp; + return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ()); + } +@@ -702,7 +703,7 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return parameter_list; + } + +@@ -714,11 +715,11 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -727,7 +728,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -766,7 +767,7 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return parameter_list; + } + +@@ -778,11 +779,11 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -791,7 +792,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -892,23 +893,23 @@ + static const class TAO_operation_db_entry wordlist[] = + { + {"",0},{"",0},{"",0},{"",0}, +- {"find", &POA_ImplementationRepository::Administration::find_skel}, ++ {"find", &POA_ImplementationRepository::Administration::find_skel}, + {"",0},{"",0},{"",0},{"",0}, + {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, + {"_interface", &POA_ImplementationRepository::Administration::_interface_skel}, + {"",0},{"",0}, +- {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, +- {"list", &POA_ImplementationRepository::Administration::list_skel}, +- {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, ++ {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, ++ {"list", &POA_ImplementationRepository::Administration::list_skel}, ++ {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, + {"",0}, +- {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, ++ {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, + {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, +- {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, +- {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, ++ {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, ++ {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, + {"",0}, +- {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, ++ {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, + {"",0},{"",0},{"",0},{"",0},{"",0}, +- {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, ++ {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) +@@ -944,14 +945,14 @@ + { + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + this->proxy_cache_[i] = 0; +- ++ + } + + POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void) + { + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + delete this->proxy_cache_[i]; +- ++ + } + + ImplementationRepository::_TAO_Administration_Proxy_Impl& +@@ -962,25 +963,25 @@ + { + int strategy = + TAO_ORB_Core::collocation_strategy (object); +- ++ + if (this->proxy_cache_[strategy] != 0) + return *this->proxy_cache_[strategy]; +- ++ + this->create_proxy (strategy, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); +- ++ + return *this->proxy_cache_[strategy]; +- ++ + } + +-void ++void + POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy ( + int strategy, + CORBA::Environment &ACE_TRY_ENV + ) + { + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); +- ++ + if (this->proxy_cache_[strategy] == 0) + { + switch (strategy) +@@ -993,7 +994,7 @@ + ); + ACE_CHECK; + break; +- ++ + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], +@@ -1002,7 +1003,7 @@ + ); + ACE_CHECK; + break; +- ++ + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: + default: + ACE_NEW_THROW_EX ( +@@ -1012,9 +1013,9 @@ + ); + ACE_CHECK; + break; +- ++ + } +- ++ + } + } + +@@ -1035,14 +1036,14 @@ + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long _dummy_) + { + ACE_UNUSED_ARG (_dummy_); +- +- ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = ++ ++ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function; +- ++ + return 0; + } + +-static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = ++static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer)); + + +@@ -1396,7 +1397,7 @@ + server, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server ( +@@ -1418,7 +1419,7 @@ + options, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server ( +@@ -1439,7 +1440,7 @@ + options, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( +@@ -1459,7 +1460,7 @@ + server, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( +@@ -1479,7 +1480,7 @@ + server, + ACE_TRY_ENV + ); +- ++ + } + + char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running ( +@@ -1503,7 +1504,7 @@ + server_object, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( +@@ -1523,7 +1524,7 @@ + server, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find ( +@@ -1545,7 +1546,7 @@ + info, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list ( +@@ -1568,7 +1569,7 @@ + server_iterator, + ACE_TRY_ENV + ); +- ++ + } + + +@@ -1593,14 +1594,14 @@ + + void POA_ImplementationRepository::Administration::activate_server_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); + CORBA::String_var server; + if (!( +@@ -1614,27 +1615,27 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->activate_server ( + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -1642,7 +1643,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -1663,23 +1664,23 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::Administration::register_server_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); + CORBA::String_var server; + ImplementationRepository::StartupOptions options; +@@ -1695,7 +1696,7 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri ( + _tao_server_request, + _tao_impl, +@@ -1703,21 +1704,21 @@ + options, + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->register_server ( + server.in (), + options, + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -1725,7 +1726,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -1746,23 +1747,23 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::Administration::reregister_server_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); + CORBA::String_var server; + ImplementationRepository::StartupOptions options; +@@ -1778,7 +1779,7 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri ( + _tao_server_request, + _tao_impl, +@@ -1786,21 +1787,21 @@ + options, + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->reregister_server ( + server.in (), + options, + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -1808,7 +1809,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -1829,23 +1830,23 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::Administration::remove_server_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); + CORBA::String_var server; + if (!( +@@ -1859,27 +1860,27 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->remove_server ( + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -1887,7 +1888,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -1908,23 +1909,23 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::Administration::shutdown_server_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); + CORBA::String_var server; + if (!( +@@ -1938,27 +1939,27 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->shutdown_server ( + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -1966,7 +1967,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -1987,23 +1988,23 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::Administration::server_is_running_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + CORBA::String_var _tao_retval; + CORBA::String_var server; + CORBA::String_var addr; +@@ -2021,7 +2022,7 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri ( + _tao_server_request, + _tao_impl, +@@ -2030,14 +2031,14 @@ + server_object.in (), + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- _tao_retval = ++ _tao_retval = + _tao_impl->server_is_running ( + server.in (), + addr.in (), +@@ -2045,7 +2046,7 @@ + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + char * _tao_retval_info = _tao_retval._retn (); + ri.result (_tao_retval_info); +@@ -2056,7 +2057,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -2077,11 +2078,11 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + if (!( + (_tao_out << _tao_retval.in ()) + )) +@@ -2093,14 +2094,14 @@ + + void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); + CORBA::String_var server; + if (!( +@@ -2114,27 +2115,27 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->server_is_shutting_down ( + server.in (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -2142,7 +2143,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -2163,23 +2164,23 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::Administration::find_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + CORBA::String_var server; + ImplementationRepository::ServerInformation_var info; + if (!( +@@ -2193,28 +2194,28 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri ( + _tao_server_request, + _tao_impl, + server.in (), + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->find ( + server.in (), + info.out (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -2222,7 +2223,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -2243,11 +2244,11 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + if (!( + (_tao_out << info.in ()) + )) +@@ -2259,14 +2260,14 @@ + + void POA_ImplementationRepository::Administration::list_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; +- ++ + CORBA::ULong how_many; + ImplementationRepository::ServerInformationList_var server_list; + ImplementationRepository::ServerInformationIterator_var server_iterator; +@@ -2281,22 +2282,22 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri ( + _tao_server_request, + _tao_impl, +- how_many ++ how_many + , + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->list ( + how_many, + server_list.out (), +@@ -2304,7 +2305,7 @@ + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -2312,7 +2313,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -2333,11 +2334,11 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + if (!( + (_tao_out << server_list.in ()) && + (_tao_out << server_iterator.in ()) +@@ -2349,7 +2350,7 @@ + } + + void POA_ImplementationRepository::Administration::_is_a_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -2361,10 +2362,10 @@ + CORBA::String_var value; + if (!(_tao_in >> value.out ())) + ACE_THROW (CORBA::MARSHAL ()); +- ++ + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) +@@ -2372,7 +2373,7 @@ + } + + void POA_ImplementationRepository::Administration::_non_existent_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -2381,7 +2382,7 @@ + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) +@@ -2389,7 +2390,7 @@ + } + + void POA_ImplementationRepository::Administration::_interface_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -2398,26 +2399,26 @@ + POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; + CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::Boolean _tao_result = 0; +- ++ + TAO_IFR_Client_Adapter *_tao_adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); +- ++ + if (_tao_adapter == 0) + { + ACE_THROW (CORBA::INTF_REPOS ()); + } +- ++ + ACE_TRY + { + _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + _tao_result = + _tao_adapter->interfacedef_cdr_insert ( + _tao_out, +@@ -2429,7 +2430,7 @@ + _tao_adapter->dispose (_tao_retval); + } + ACE_ENDTRY; +- ++ + if (_tao_result == 0) + { + ACE_THROW (CORBA::MARSHAL ()); +@@ -2443,7 +2444,7 @@ + { + const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + if ( + (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) +@@ -2478,14 +2479,14 @@ + { + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Object_ptr tmp = CORBA::Object::_nil (); +- ++ + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); + else + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); +- ++ + CORBA::Object_var obj = tmp; + return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ()); + } +@@ -2511,14 +2512,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -2530,15 +2531,15 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, + {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + }; +- ++ + exception_list->length (2); + for (CORBA::ULong i = 0; i < 2; ++i) + { +@@ -2550,7 +2551,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -2559,7 +2560,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -2602,20 +2603,20 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; +- ++ + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -2627,14 +2628,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -2646,7 +2647,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -2655,7 +2656,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -2698,20 +2699,20 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_options = parameter_list->length (); + parameter_list->length (length_options + 1); + (*parameter_list)[length_options].argument <<= this->options_; +- ++ + (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -2723,11 +2724,11 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -2736,7 +2737,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -2777,14 +2778,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -2796,14 +2797,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -2815,7 +2816,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -2824,7 +2825,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -2865,14 +2866,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -2884,14 +2885,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -2903,7 +2904,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -2912,7 +2913,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -2957,25 +2958,25 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_addr = parameter_list->length (); + parameter_list->length (length_addr + 1); + (*parameter_list)[length_addr].argument <<= addr_; + (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN; +- ++ + CORBA::ULong length_server_object = parameter_list->length (); + parameter_list->length (length_server_object + 1); + (*parameter_list)[length_server_object].argument <<= this->server_object_; +- ++ + (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -2987,14 +2988,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -3006,7 +3007,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -3015,11 +3016,11 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Any_var safe_result_any = result_any; +- ++ + (*result_any) <<= this->_result; +- ++ + return safe_result_any._retn (); + } + +@@ -3041,7 +3042,7 @@ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); + } + +-void ++void + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) + { + // Update the result. +@@ -3067,14 +3068,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -3086,14 +3087,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -3105,7 +3106,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -3114,7 +3115,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -3155,14 +3156,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_server = parameter_list->length (); + parameter_list->length (length_server + 1); + (*parameter_list)[length_server].argument <<= server_; + (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -3174,14 +3175,14 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ExceptionList_var safe_exception_list = exception_list; +- +- static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = ++ ++ static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = + { + {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + }; +- ++ + exception_list->length (1); + for (CORBA::ULong i = 0; i < 1; ++i) + { +@@ -3193,7 +3194,7 @@ + return safe_exception_list._retn (); + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -3202,7 +3203,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -3227,13 +3228,13 @@ + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, +- const CORBA::ULong & how_many ++ const CORBA::ULong & how_many + , + CORBA::Environment & + ) + : TAO_ServerRequestInfo (_tao_server_request), + _tao_impl (tao_impl), +- how_many_ (how_many) ++ how_many_ (how_many) + + {} + +@@ -3245,14 +3246,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; +- ++ + + return safe_parameter_list._retn (); + } +@@ -3265,11 +3266,11 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -3278,7 +3279,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + +@@ -3380,8 +3381,8 @@ + { + {"",0},{"",0},{"",0},{"",0},{"",0}, + {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel}, +- {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, +- {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, ++ {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, ++ {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, + {"",0},{"",0}, + {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel}, + {"",0},{"",0}, +@@ -3421,14 +3422,14 @@ + { + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + this->proxy_cache_[i] = 0; +- ++ + } + + POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) + { + for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) + delete this->proxy_cache_[i]; +- ++ + } + + ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& +@@ -3439,25 +3440,25 @@ + { + int strategy = + TAO_ORB_Core::collocation_strategy (object); +- ++ + if (this->proxy_cache_[strategy] != 0) + return *this->proxy_cache_[strategy]; +- ++ + this->create_proxy (strategy, ACE_TRY_ENV); + ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); +- ++ + return *this->proxy_cache_[strategy]; +- ++ + } + +-void ++void + POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( + int strategy, + CORBA::Environment &ACE_TRY_ENV + ) + { + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); +- ++ + if (this->proxy_cache_[strategy] == 0) + { + switch (strategy) +@@ -3470,7 +3471,7 @@ + ); + ACE_CHECK; + break; +- ++ + case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: + ACE_NEW_THROW_EX ( + this->proxy_cache_[strategy], +@@ -3479,7 +3480,7 @@ + ); + ACE_CHECK; + break; +- ++ + case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: + default: + ACE_NEW_THROW_EX ( +@@ -3489,9 +3490,9 @@ + ); + ACE_CHECK; + break; +- ++ + } +- ++ + } + } + +@@ -3512,14 +3513,14 @@ + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long _dummy_) + { + ACE_UNUSED_ARG (_dummy_); +- +- ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = ++ ++ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function; +- ++ + return 0; + } + +-static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = ++static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer)); + + +@@ -3627,7 +3628,7 @@ + server_list, + ACE_TRY_ENV + ); +- ++ + } + + void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( +@@ -3644,7 +3645,7 @@ + )->destroy ( + ACE_TRY_ENV + ); +- ++ + } + + +@@ -3669,14 +3670,14 @@ + + void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + TAO_InputCDR &_tao_in = _tao_server_request.incoming (); + POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; +- ++ + CORBA::Boolean _tao_retval = 0; + CORBA::ULong how_many; + ImplementationRepository::ServerInformationList_var server_list; +@@ -3691,28 +3692,28 @@ + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( + _tao_server_request, + _tao_impl, + how_many, + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- _tao_retval = ++ _tao_retval = + _tao_impl->next_n ( + how_many, + server_list.out (), + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + CORBA::Boolean _tao_retval_info = _tao_retval; + ri.result (_tao_retval_info); +@@ -3722,7 +3723,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -3743,11 +3744,11 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + if (!( + (_tao_out << CORBA::Any::from_boolean (_tao_retval)) && + (_tao_out << server_list.in ()) +@@ -3760,39 +3761,39 @@ + + void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( + TAO_ServerRequest &_tao_server_request, +- void *_tao_object_reference, +- void * /* context */, ++ void *_tao_object_reference, ++ void * /* context */, + CORBA::Environment &ACE_TRY_ENV + ) + { + POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; +- ++ + _tao_server_request.argument_flag (0); +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + TAO_ServerRequestInterceptor_Adapter _tao_vfr ( + _tao_server_request.orb_core ()->server_request_interceptors (), + _tao_server_request.interceptor_count () + ); +- ++ + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( + _tao_server_request, + _tao_impl, + ACE_TRY_ENV + ); +- ++ + ACE_TRY + { + _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_impl->destroy ( + ACE_TRY_ENV + ); + TAO_INTERCEPTOR_CHECK; +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + ri.reply_status (PortableInterceptor::SUCCESSFUL); + _tao_vfr.send_reply (&ri, ACE_TRY_ENV); +@@ -3800,7 +3801,7 @@ + } + ACE_CATCH (PortableInterceptor::ForwardRequest, exc) + { +- ri.forward_reference (exc); ++ ri.forward_reference (exc); + _tao_vfr.send_other ( + &ri, + ACE_TRY_ENV +@@ -3821,15 +3822,15 @@ + ACE_ENDTRY; + ACE_CHECK; + #endif /* TAO_HAS_INTERCEPTORS */ +- ++ + _tao_server_request.init_reply (); +- ++ + // In case ACE_TRY_ENV is not used in this function + ACE_UNUSED_ARG (ACE_TRY_ENV); + } + + void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -3841,10 +3842,10 @@ + CORBA::String_var value; + if (!(_tao_in >> value.out ())) + ACE_THROW (CORBA::MARSHAL ()); +- ++ + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) +@@ -3852,7 +3853,7 @@ + } + + void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -3861,7 +3862,7 @@ + POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); + ACE_CHECK; +- ++ + _tao_server_request.init_reply (); + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) +@@ -3869,7 +3870,7 @@ + } + + void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, + void * _tao_object_reference, + void * /* context */, + CORBA::Environment &ACE_TRY_ENV +@@ -3878,26 +3879,26 @@ + POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; + CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::Boolean _tao_result = 0; +- ++ + TAO_IFR_Client_Adapter *_tao_adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); +- ++ + if (_tao_adapter == 0) + { + ACE_THROW (CORBA::INTF_REPOS ()); + } +- ++ + ACE_TRY + { + _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + ACE_TRY_CHECK; +- ++ + _tao_server_request.init_reply (); +- ++ + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); +- ++ + _tao_result = + _tao_adapter->interfacedef_cdr_insert ( + _tao_out, +@@ -3909,7 +3910,7 @@ + _tao_adapter->dispose (_tao_retval); + } + ACE_ENDTRY; +- ++ + if (_tao_result == 0) + { + ACE_THROW (CORBA::MARSHAL ()); +@@ -3923,7 +3924,7 @@ + { + const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + if ( + (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) +@@ -3958,14 +3959,14 @@ + { + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Object_ptr tmp = CORBA::Object::_nil (); +- ++ + if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); + else + ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); +- ++ + CORBA::Object_var obj = tmp; + return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ()); + } +@@ -3991,14 +3992,14 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + Dynamic::ParameterList_var safe_parameter_list = parameter_list; +- ++ + CORBA::ULong length_how_many = parameter_list->length (); + parameter_list->length (length_how_many + 1); + (*parameter_list)[length_how_many].argument <<= how_many_; + (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; +- ++ + return safe_parameter_list._retn (); + } + +@@ -4010,11 +4011,11 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4023,11 +4024,11 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + CORBA::Any_var safe_result_any = result_any; +- ++ + (*result_any) <<= CORBA::Any::from_boolean (this->_result); +- ++ + return safe_result_any._retn (); + } + +@@ -4049,7 +4050,7 @@ + return this->_tao_impl->_is_a (id, ACE_TRY_ENV); + } + +-void ++void + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) + { + // Update the result. +@@ -4073,7 +4074,7 @@ + Dynamic::ParameterList *parameter_list = + TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return parameter_list; + } + +@@ -4085,11 +4086,11 @@ + Dynamic::ExceptionList *exception_list = + TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return exception_list; + } + +-CORBA::Any * ++CORBA::Any * + POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + { +@@ -4098,7 +4099,7 @@ + CORBA::Any *result_any = + TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); +- ++ + return result_any; + } + diff --git a/TAO/tao/diffs/ImplRepoS.h.diff b/TAO/tao/diffs/ImplRepoS.h.diff new file mode 100644 index 00000000000..f8a283b3bea --- /dev/null +++ b/TAO/tao/diffs/ImplRepoS.h.diff @@ -0,0 +1,1681 @@ +--- orig/ImplRepoS.h Sun Apr 1 16:33:09 2001 ++++ ImplRepoS.h Sun Apr 1 17:47:56 2001 +@@ -56,7 +56,7 @@ + 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: +@@ -69,7 +69,7 @@ + + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -81,7 +81,7 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -89,7 +89,7 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -97,26 +97,26 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void _dispatch ( + TAO_ServerRequest &_tao_req, + void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + ::ImplementationRepository::ServerObject *_this ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual const char* _interface_repository_id (void) const; + + virtual void ping ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -124,15 +124,15 @@ + )) = 0; + + static void ping_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void shutdown ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -140,14 +140,14 @@ + )) = 0; + + static void shutdown_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts +@@ -160,7 +160,7 @@ + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerObject *tao_impl, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -169,37 +169,37 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); +- ++ + private: + POA_ImplementationRepository::ServerObject *_tao_impl; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo + { + public: +@@ -207,7 +207,7 @@ + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerObject *tao_impl, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -216,103 +216,103 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); +- ++ + private: + POA_ImplementationRepository::ServerObject *_tao_impl; +- ++ + }; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + }; + +- ++ + /////////////////////////////////////////////////////////////////////// +- // Strategized Proxy Broker Declaration ++ // Strategized Proxy Broker Declaration + // +- ++ + class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker + { +- public: ++ public: + _TAO_ServerObject_Strategized_Proxy_Broker (void); +- ++ + virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void); +- ++ + virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy ( + ::ImplementationRepository::ServerObject *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ); +- ++ + private: +- ++ + // Helper methods that takes care to create the proxy + // as soon as their use is necessary. + void create_proxy ( + int collocation_strategy, + CORBA::Environment &ACE_TRY_ENV + ); +- ++ + private: +- ++ + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; +- ++ + TAO_SYNCH_MUTEX mutex_; + // This funxtion is used to get an handle to the unique instance + // of the Strategized Proxy Broker that is available for a given + // interface. +- ++ + public: + static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void); + }; +- +- ++ ++ + // +- // End Strategized Proxy Broker Declaration ++ // End Strategized Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// +- +- ++ ++ + /////////////////////////////////////////////////////////////////////// + // ThruPOA Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : + public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl + { + public: + _TAO_ServerObject_ThruPOA_Proxy_Impl (void); +- ++ + virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { } +- ++ + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV +@@ -341,15 +341,15 @@ + // Direct Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : + public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl + { + public: + _TAO_ServerObject_Direct_Proxy_Impl (void); +- ++ + virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { } +- ++ + virtual void ping ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV +@@ -390,7 +390,7 @@ + // ctor with T*, ownership flag and a POA + ~ServerObject_tie (void); + // dtor +- ++ + // TIE specific functions + T *_tied_object (void); + // return the underlying object +@@ -402,14 +402,14 @@ + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership +- ++ + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + void ping ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -417,7 +417,7 @@ + )); + + void shutdown ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -428,7 +428,7 @@ + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; +- ++ + // copy and assignment are not allowed + ServerObject_tie (const ServerObject_tie &); + void operator= (const ServerObject_tie &); +@@ -455,7 +455,7 @@ + + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -467,7 +467,7 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -475,7 +475,7 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -483,19 +483,19 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void _dispatch ( + TAO_ServerRequest &_tao_req, + void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + ::ImplementationRepository::Administration *_this ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -503,7 +503,7 @@ + + virtual void activate_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -513,17 +513,17 @@ + )) = 0; + + static void activate_server_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void register_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -532,17 +532,17 @@ + )) = 0; + + static void register_server_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void reregister_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -550,16 +550,16 @@ + )) = 0; + + static void reregister_server_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void remove_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -568,16 +568,16 @@ + )) = 0; + + static void remove_server_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void shutdown_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -586,10 +586,10 @@ + )) = 0; + + static void shutdown_server_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -597,7 +597,7 @@ + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -606,16 +606,16 @@ + )) = 0; + + static void server_is_running_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void server_is_shutting_down ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -624,17 +624,17 @@ + )) = 0; + + static void server_is_shutting_down_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void find ( + const char * server, + ImplementationRepository::ServerInformation_out info, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -643,10 +643,10 @@ + )) = 0; + + static void find_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -654,7 +654,7 @@ + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -662,14 +662,14 @@ + )) = 0; + + static void list_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts +@@ -683,7 +683,7 @@ + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -692,38 +692,38 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo + { + public: +@@ -733,7 +733,7 @@ + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -742,39 +742,39 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + const ImplementationRepository::StartupOptions & options_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo + { + public: +@@ -784,7 +784,7 @@ + POA_ImplementationRepository::Administration *tao_impl, + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -793,39 +793,39 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + const ImplementationRepository::StartupOptions & options_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo + { + public: +@@ -834,7 +834,7 @@ + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -843,38 +843,38 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo + { + public: +@@ -883,7 +883,7 @@ + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -892,38 +892,38 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo + { + public: +@@ -934,7 +934,7 @@ + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -943,42 +943,42 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; + const char * addr_; + ImplementationRepository::ServerObject_ptr server_object_; + void result (char * result); +- // update the result ++ // update the result + char * _result; + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo + { + public: +@@ -987,7 +987,7 @@ + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -996,38 +996,38 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo + { + public: +@@ -1036,7 +1036,7 @@ + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1045,38 +1045,38 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const char * server_; +- ++ + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo + { + public: +@@ -1084,9 +1084,9 @@ + TAO_ServerRequestInfo_ImplementationRepository_Administration_list ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::Administration *tao_impl, +- const CORBA::ULong & how_many ++ const CORBA::ULong & how_many + , +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1095,55 +1095,55 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); +- ++ + private: + POA_ImplementationRepository::Administration *_tao_impl; + const CORBA::ULong & how_many_; +- ++ + + }; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + }; + + + /////////////////////////////////////////////////////////////////////// +-// Strategized Proxy Broker Declaration ++// Strategized Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker + { +-public: ++public: + _TAO_Administration_Strategized_Proxy_Broker (void); +- ++ + virtual ~_TAO_Administration_Strategized_Proxy_Broker (void); +- ++ + virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy ( + ::ImplementationRepository::Administration *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () +@@ -1159,13 +1159,13 @@ + ); + + private: +- ++ + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::ImplementationRepository::_TAO_Administration_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; +- ++ + TAO_SYNCH_MUTEX mutex_; + // This funxtion is used to get an handle to the unique instance + // of the Strategized Proxy Broker that is available for a given +@@ -1177,7 +1177,7 @@ + + + // +-// End Strategized Proxy Broker Declaration ++// End Strategized Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + +@@ -1185,15 +1185,15 @@ + // ThruPOA Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : + public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl + { + public: + _TAO_Administration_ThruPOA_Proxy_Impl (void); +- ++ + virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { } +- ++ + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, +@@ -1302,15 +1302,15 @@ + // Direct Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : + public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl + { + public: + _TAO_Administration_Direct_Proxy_Impl (void); +- ++ + virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { } +- ++ + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, +@@ -1431,7 +1431,7 @@ + // ctor with T*, ownership flag and a POA + ~Administration_tie (void); + // dtor +- ++ + // TIE specific functions + T *_tied_object (void); + // return the underlying object +@@ -1443,15 +1443,15 @@ + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership +- ++ + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + void activate_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1463,7 +1463,7 @@ + void register_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1474,7 +1474,7 @@ + void reregister_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1483,7 +1483,7 @@ + + void remove_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1493,7 +1493,7 @@ + + void shutdown_server ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1505,7 +1505,7 @@ + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1515,7 +1515,7 @@ + + void server_is_shutting_down ( + const char * server, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1526,7 +1526,7 @@ + void find ( + const char * server, + ImplementationRepository::ServerInformation_out info, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1538,7 +1538,7 @@ + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1549,7 +1549,7 @@ + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; +- ++ + // copy and assignment are not allowed + Administration_tie (const Administration_tie &); + void operator= (const Administration_tie &); +@@ -1576,7 +1576,7 @@ + + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1588,7 +1588,7 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1596,7 +1596,7 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1604,19 +1604,19 @@ + TAO_ServerRequest &req, + void *obj, + void *context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void _dispatch ( + TAO_ServerRequest &_tao_req, + void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + ::ImplementationRepository::ServerInformationIterator *_this ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1625,7 +1625,7 @@ + virtual CORBA::Boolean next_n ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1633,15 +1633,15 @@ + )) = 0; + + static void next_n_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void destroy ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1649,14 +1649,14 @@ + )) = 0; + + static void destroy_skel ( +- TAO_ServerRequest &_tao_req, +- void *_tao_obj, +- void *_tao_context, +- CORBA::Environment &ACE_TRY_ENV = ++ TAO_ServerRequest &_tao_req, ++ void *_tao_obj, ++ void *_tao_context, ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +- ++ + #if (TAO_HAS_INTERCEPTORS == 1) + // Generation of interceptors related RequestInfo classes per operation. + // This needed to be able to store the arguments, exceptions, contexts +@@ -1670,7 +1670,7 @@ + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerInformationIterator *tao_impl, + const CORBA::ULong & how_many, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1679,40 +1679,40 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); +- ++ + private: + POA_ImplementationRepository::ServerInformationIterator *_tao_impl; + const CORBA::ULong & how_many_; + void result (CORBA::Boolean result); +- // update the result ++ // update the result + CORBA::Boolean _result; + }; +- ++ + class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo + { + public: +@@ -1720,7 +1720,7 @@ + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( + TAO_ServerRequest &_tao_server_request, + POA_ImplementationRepository::ServerInformationIterator *tao_impl, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + +@@ -1729,53 +1729,53 @@ + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual Dynamic::ExceptionList * exceptions ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Any * result ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual char * target_most_derived_interface ( + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + virtual CORBA::Boolean target_is_a ( + const char * id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); +- ++ + private: + TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); + void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); +- ++ + private: + POA_ImplementationRepository::ServerInformationIterator *_tao_impl; +- ++ + }; +- ++ + #endif /* TAO_HAS_INTERCEPTORS */ + + }; + + + /////////////////////////////////////////////////////////////////////// +-// Strategized Proxy Broker Declaration ++// Strategized Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker + { +-public: ++public: + _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); +- ++ + virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void); +- ++ + virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ::ImplementationRepository::ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () +@@ -1791,13 +1791,13 @@ + ); + + private: +- ++ + // Caches the proxy implementations. The proxy implementation + // are totally stateless, and those can be shared by all the + // instances of a given IDL interface type. + ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl + *proxy_cache_[TAO_Collocation_Strategies::CS_LAST]; +- ++ + TAO_SYNCH_MUTEX mutex_; + // This funxtion is used to get an handle to the unique instance + // of the Strategized Proxy Broker that is available for a given +@@ -1809,7 +1809,7 @@ + + + // +-// End Strategized Proxy Broker Declaration ++// End Strategized Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + +@@ -1817,15 +1817,15 @@ + // ThruPOA Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : + public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_ThruPOA_Object_Proxy_Impl + { + public: + _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void); +- ++ + virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { } +- ++ + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, +@@ -1856,15 +1856,15 @@ + // Direct Impl. Declaration + // + +-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : ++class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : + public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_Direct_Object_Proxy_Impl + { + public: + _TAO_ServerInformationIterator_Direct_Proxy_Impl (void); +- ++ + virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { } +- ++ + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, +@@ -1907,7 +1907,7 @@ + // ctor with T*, ownership flag and a POA + ~ServerInformationIterator_tie (void); + // dtor +- ++ + // TIE specific functions + T *_tied_object (void); + // return the underlying object +@@ -1919,16 +1919,16 @@ + // do we own it + void _is_owner (CORBA::Boolean b); + // set the ownership +- ++ + // overridden ServantBase operations + PortableServer::POA_ptr _default_POA ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + CORBA::Boolean next_n ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1936,7 +1936,7 @@ + )); + + void destroy ( +- CORBA::Environment &ACE_TRY_ENV = ++ CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( +@@ -1947,7 +1947,7 @@ + T *ptr_; + PortableServer::POA_var poa_; + CORBA::Boolean rel_; +- ++ + // copy and assignment are not allowed + ServerInformationIterator_tie (const ServerInformationIterator_tie &); + void operator= (const ServerInformationIterator_tie &); diff --git a/TAO/tao/diffs/ImplRepoS.i.diff b/TAO/tao/diffs/ImplRepoS.i.diff new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/TAO/tao/diffs/ImplRepoS.i.diff diff --git a/TAO/tao/diffs/ImplRepoS_T.cpp.diff b/TAO/tao/diffs/ImplRepoS_T.cpp.diff new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/TAO/tao/diffs/ImplRepoS_T.cpp.diff diff --git a/TAO/tao/diffs/ImplRepoS_T.h.diff b/TAO/tao/diffs/ImplRepoS_T.h.diff new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/TAO/tao/diffs/ImplRepoS_T.h.diff diff --git a/TAO/tao/diffs/ImplRepoS_T.i.diff b/TAO/tao/diffs/ImplRepoS_T.i.diff new file mode 100644 index 00000000000..62afc1a379b --- /dev/null +++ b/TAO/tao/diffs/ImplRepoS_T.i.diff @@ -0,0 +1,131 @@ +--- orig/ImplRepoS_T.i Sun Apr 1 16:33:09 2001 ++++ ImplRepoS_T.i Sun Apr 1 17:48:11 2001 +@@ -23,30 +23,30 @@ + #if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t) +- : ptr_ (&t), +- poa_ (PortableServer::POA::_nil ()), +- rel_ (0) ++ : ptr_ (&t), ++ poa_ (PortableServer::POA::_nil ()), ++ rel_ (0) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t, PortableServer::POA_ptr poa) +- : ptr_ (&t), +- poa_ (PortableServer::POA::_duplicate (poa)), +- rel_ (0) ++ : ptr_ (&t), ++ poa_ (PortableServer::POA::_duplicate (poa)), ++ rel_ (0) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, CORBA::Boolean release) +- : ptr_ (tp), +- poa_ (PortableServer::POA::_nil ()), +- rel_ (release) ++ : ptr_ (tp), ++ poa_ (PortableServer::POA::_nil ()), ++ rel_ (release) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) +- : ptr_ (tp), +- poa_ (PortableServer::POA::_duplicate (poa)), +- rel_ (release) ++ : ptr_ (tp), ++ poa_ (PortableServer::POA::_duplicate (poa)), ++ rel_ (release) + {} + + template <class T> ACE_INLINE +@@ -129,30 +129,30 @@ + #if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE + POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t) +- : ptr_ (&t), +- poa_ (PortableServer::POA::_nil ()), +- rel_ (0) ++ : ptr_ (&t), ++ poa_ (PortableServer::POA::_nil ()), ++ rel_ (0) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t, PortableServer::POA_ptr poa) +- : ptr_ (&t), +- poa_ (PortableServer::POA::_duplicate (poa)), +- rel_ (0) ++ : ptr_ (&t), ++ poa_ (PortableServer::POA::_duplicate (poa)), ++ rel_ (0) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, CORBA::Boolean release) +- : ptr_ (tp), +- poa_ (PortableServer::POA::_nil ()), +- rel_ (release) ++ : ptr_ (tp), ++ poa_ (PortableServer::POA::_nil ()), ++ rel_ (release) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) +- : ptr_ (tp), +- poa_ (PortableServer::POA::_duplicate (poa)), +- rel_ (release) ++ : ptr_ (tp), ++ poa_ (PortableServer::POA::_duplicate (poa)), ++ rel_ (release) + {} + + template <class T> ACE_INLINE +@@ -366,30 +366,30 @@ + #if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t) +- : ptr_ (&t), +- poa_ (PortableServer::POA::_nil ()), +- rel_ (0) ++ : ptr_ (&t), ++ poa_ (PortableServer::POA::_nil ()), ++ rel_ (0) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa) +- : ptr_ (&t), +- poa_ (PortableServer::POA::_duplicate (poa)), +- rel_ (0) ++ : ptr_ (&t), ++ poa_ (PortableServer::POA::_duplicate (poa)), ++ rel_ (0) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, CORBA::Boolean release) +- : ptr_ (tp), +- poa_ (PortableServer::POA::_nil ()), +- rel_ (release) ++ : ptr_ (tp), ++ poa_ (PortableServer::POA::_nil ()), ++ rel_ (release) + {} + + template <class T> ACE_INLINE + POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) +- : ptr_ (tp), +- poa_ (PortableServer::POA::_duplicate (poa)), +- rel_ (release) ++ : ptr_ (tp), ++ poa_ (PortableServer::POA::_duplicate (poa)), ++ rel_ (release) + {} + + template <class T> ACE_INLINE |