diff options
Diffstat (limited to 'TAO/tao/PI_Server')
34 files changed, 518 insertions, 808 deletions
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 23ed31147d2..9aff070ca96 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -1,4 +1,4 @@ -#include "tao/PI_Server/PICurrent_Guard.h" +#include "PICurrent_Guard.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -14,8 +14,6 @@ ACE_RCSID (PortableServer, #include "tao/PI/PICurrent.h" #include "tao/PI/PICurrent_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, bool tsc_to_rsc) : src_ (0), @@ -64,9 +62,11 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, TAO::PICurrent_Guard::~PICurrent_Guard (void) { if (this->src_ != 0 && this->dest_ != 0 - && this->src_ != this->dest_ - && this->dest_->lc_slot_table (this->src_)) + && this->src_ != this->dest_) { + // This copy better be exception-safe! + this->dest_->lc_slot_table (this->src_); + // PICurrent will potentially have to call back on the request // scope current so that it can deep copy the contents of the // thread scope current if the contents of the thread scope @@ -76,12 +76,10 @@ TAO::PICurrent_Guard::~PICurrent_Guard (void) // necessary, if the thread scope current is modified after its // contents have been *logically* copied to the request scope // current. The same goes for the reverse, i.e. RSC to TSC. - this->copy_callback_->src_and_dst (this->src_, this->dest_); this->src_->copy_callback (this->copy_callback_); } } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 364ec199d29..6bbda8f3ec4 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if TAO_HAS_INTERCEPTORS == 1 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_ServerRequest; @@ -48,7 +46,7 @@ namespace TAO * * @note This Guard class is only used on the server side. */ - class PICurrent_Guard + class TAO_PI_Server_Export PICurrent_Guard { public: @@ -101,8 +99,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index 1511cfb1472..9217b032970 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -1,14 +1,11 @@ -#include "tao/PI_Server/PI_Server.h" -#include "tao/PI_Server/PI_Server_Loader.h" -#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h" +#include "PI_Server.h" +#include "PI_Server_Loader.h" +#include "ServerRequestInterceptor_Factory_Impl.h" ACE_RCSID (PI_Server, PI_Server, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_PI_Server_Init::Initializer (void) { @@ -19,4 +16,3 @@ TAO_PI_Server_Init::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PI_Server_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index eed7d6cc8eb..e130e064684 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PI_Server_Init * @@ -41,11 +37,9 @@ static int TAO_Requires_PI_Server_Initializer = TAO_PI_Server_Init::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_PI_SERVER_SAFE_INCLUDE -#include "tao/PI_Server/ServerRequestInterceptorC.h" -#include "tao/PI_Server/ServerRequestInfoC.h" +#include "ServerRequestInterceptorC.h" +#include "ServerRequestInfoC.h" #undef TAO_PI_SERVER_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index abc2da4613c..e3dacc74cfb 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PI_Server/PI_Server_Loader.h" -#include "tao/PI_Server/PortableServer_ORBInitializer.h" +#include "PI_Server_Loader.h" +#include "PortableServer_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -12,8 +12,6 @@ ACE_RCSID (PI_Server, PI_Server_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) { } @@ -29,13 +27,13 @@ TAO_PI_Server_Loader::init (int, { ACE_TRACE ("TAO_PI_Server_Loader::init"); - static bool initialized = false; + static int initialized = 0; // Only allow initialization once. if (initialized) return 0; - initialized = true; + initialized = 1; // Register the ORB initializer. ACE_DECLARE_NEW_CORBA_ENV; @@ -64,17 +62,14 @@ TAO_PI_Server_Loader::init (int, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + "(%P | %t) Caught exception:"); return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index b80753436b9..02228437152 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -1,10 +1,15 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file PI_Server_Loader.h * * $Id$ + * + * Header file for Loading RTScheduler. + * + * + * @author Yamuna Krishnamurthy <yamuna@oomworks.com> */ //============================================================================= @@ -12,18 +17,15 @@ #define TAO_PI_SERVER_LOADER_H #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object { public: @@ -38,8 +40,6 @@ public: ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl index ad7b82138bf..0b86cdf7238 100644 --- a/TAO/tao/PI_Server/PI_Server_include.pidl +++ b/TAO/tao/PI_Server/PI_Server_include.pidl @@ -10,6 +10,6 @@ #define _PORTABLESERVER_INCLUDE_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/PI_Server/ServerRequestInterceptor.pidl" +#include <tao/PI_Server/ServerRequestInterceptor.pidl> #endif /* _PORTABLESERVER_INCLUDE_IDL_ */ diff --git a/TAO/tao/PI_Server/PI_Server_includeC.h b/TAO/tao/PI_Server/PI_Server_includeC.h index cca4fe783bd..2f941a52b2e 100644 --- a/TAO/tao/PI_Server/PI_Server_includeC.h +++ b/TAO/tao/PI_Server/PI_Server_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #include "tao/PI_Server/ServerRequestInterceptorC.h" diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h index 6b4784fb607..42a5f422d4f 100644 --- a/TAO/tao/PI_Server/Policy_Creator_T.h +++ b/TAO/tao/PI_Server/Policy_Creator_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,13 +21,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - template <class POLICYTYPE, typename POLICYVALUE> + template <class POLICYTYPE, class POLICYVALUE> void create_policy ( POLICYTYPE *& policy, POLICYVALUE &value, @@ -46,8 +44,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_POLICY_CREATOR_T_H */ diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 67a496a2d58..8f891627c1b 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- -#include "tao/PI_Server/PortableServer_ORBInitializer.h" -#include "tao/PI_Server/PortableServer_PolicyFactory.h" +#include "PortableServer_ORBInitializer.h" +#include "PortableServer_PolicyFactory.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PortableServer/PortableServer.h" @@ -12,21 +12,16 @@ ACE_RCSID (PI_Server, PortableServer_ORBInitializer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void -TAO_PortableServer_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_PortableServer_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info @@ -35,9 +30,8 @@ TAO_PortableServer_ORBInitializer::post_init ( } void -TAO_PortableServer_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL) { // Register the PortableServer policy factories. PortableInterceptor::PolicyFactory_ptr tmp; @@ -55,7 +49,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( // Bind the same policy factory to all PortableServer related policy // types since a single policy factory is used to create each of the // different types of PortableServer policies. - static CORBA::PolicyType const type[] = { + CORBA::PolicyType type[] = { #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::THREAD_POLICY_ID, PortableServer::IMPLICIT_ACTIVATION_POLICY_ID, @@ -67,10 +61,10 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( PortableServer::ID_ASSIGNMENT_POLICY_ID }; - CORBA::PolicyType const * end = + const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); - for (CORBA::PolicyType const *i = type; + for (CORBA::PolicyType *i = type; i != end; ++i) { @@ -103,5 +97,3 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index 8aba0600ea2..903e5adc5f9 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -15,19 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PI/PI.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PI/PI.h" #include "tao/LocalObject.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// PortableServer ORB initializer. -class TAO_PortableServer_ORBInitializer +class TAO_PI_Server_Export TAO_PortableServer_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual TAO_Local_RefCounted_Object { @@ -58,8 +56,6 @@ private: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_ORB_INITIALIZER_H */ diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index 484403b2b32..9171b7c7e33 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -1,5 +1,5 @@ -#include "tao/PI_Server/PortableServer_PolicyFactory.h" +#include "PortableServer_PolicyFactory.h" #include "tao/PortableServer/ThreadPolicy.h" #include "tao/PortableServer/LifespanPolicy.h" @@ -9,14 +9,12 @@ #include "tao/PortableServer/RequestProcessingPolicy.h" #include "tao/PortableServer/ServantRetentionPolicy.h" #include "tao/PortableServer/PortableServer.h" -#include "tao/PI_Server/Policy_Creator_T.h" +#include "Policy_Creator_T.h" ACE_RCSID (PortableServer, PortableServer_PolicyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO_PortableServer_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -113,5 +111,3 @@ TAO_PortableServer_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h index 1a0c06ff21a..d24a1e001aa 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h @@ -15,18 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PI/PI.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PI/PI.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Policy factory for all PortableServer related policies. -class TAO_PortableServer_PolicyFactory +class TAO_PI_Server_Export TAO_PortableServer_PolicyFactory : public virtual PortableInterceptor::PolicyFactory, public virtual TAO_Local_RefCounted_Object { @@ -38,8 +37,6 @@ public: CORBA::PolicyError)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_POLICY_FACTORY_H */ diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index 4b004d89f7b..114ee17f0cf 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PI_Server/ServerInterceptorAdapter.h" +#include "ServerInterceptorAdapter.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,8 +8,8 @@ ACE_RCSID (PortableServer, ServerInterceptorAdapter, "$Id$") -#include "tao/PI_Server/ServerRequestInfo.h" -#include "tao/PI_Server/PICurrent_Guard.h" +#include "ServerRequestInfo.h" +#include "PICurrent_Guard.h" #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/TAO_Server_Request.h" @@ -19,8 +19,6 @@ ACE_RCSID (PortableServer, #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableInterceptor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void) { } @@ -42,38 +40,26 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( ACE_TRY { - oc = 0; + // Copy the request scope current (RSC) to the thread scope + // current (TSC) upon leaving this scope, i.e. just after the + // receive_request_service_contexts() completes. A "guard" is + // used to make the copy also occur if an exception is thrown. + TAO::PICurrent_Guard const pi_guard (ri->server_request (), + false /* Copy RSC to TSC */); - bool is_remote_request = !server_request.collocated (); - TAO::ServerRequestInfo request_info (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions); + oc = 0; for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - tao_ft_interception_point (&request_info, - oc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptors_[i]->tao_ft_interception_point ( + ri, + oc + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; if (oc != 0) { - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions + (void) this->send_other (ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -87,16 +73,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - server_request.forward_location (exc.forward.in ()); - server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); + ri->forward_reference (exc); + this->send_other (ri + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + + this->location_forwarded_ = true; } ACE_ENDTRY; ACE_CHECK; @@ -114,8 +96,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( { // This method implements one of the "intermediate" server side // interception point. - - if (this->interceptor_list_.size() != server_request.interceptor_count ()) + if (this->interceptor_list_.size() != this->server_request.interceptor_count ()) { // This method (i.e. the receive_request() interception point) // should only be invoked if all of the interceptors registered @@ -134,43 +115,25 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( // current (TSC) upon leaving this scope, i.e. just after the // receive_request_service_contexts() completes. A "guard" is // used to make the copy also occur if an exception is thrown. - TAO::PICurrent_Guard const pi_guard (server_request, + TAO::PICurrent_Guard const pi_guard (ri->server_request (), false /* Copy RSC to TSC */); - bool is_remote_request = !server_request.collocated (); - TAO::ServerRequestInfo request_info (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions); - for (size_t i = 0 ; i < server_request.interceptor_count (); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_request_service_contexts (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptors_[i]->receive_request_service_contexts ( + ri + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - server_request.forward_location (exc.forward.in ()); - server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); + ri->forward_reference (exc); + this->send_other (ri + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + + this->location_forwarded_ = true; } ACE_ENDTRY; ACE_CHECK; @@ -191,11 +154,20 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( CORBA::ULong nexceptions ACE_ENV_ARG_DECL) { + // This method implements one of the "starting" server side // interception point if extended interceptors are not in place. + TAO::ServerRequestInfo request_info (server_request, + args, + nargs, + servant_upcall, + exceptions, + nexceptions); + ACE_TRY { + // Copy the request scope current (RSC) to the thread scope // current (TSC) upon leaving this scope, i.e. just after the // receive_request_service_contexts() completes. A "guard" is @@ -203,27 +175,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( TAO::PICurrent_Guard const pi_guard (server_request, false /* Copy RSC to TSC */); - bool is_remote_request = !server_request.collocated (); - - TAO::ServerRequestInfo request_info (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions); - for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_request_service_contexts (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor(i)-> + receive_request_service_contexts ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; // The starting interception point completed successfully. // Push the interceptor on to the flow stack. @@ -234,13 +192,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); + this->send_other (server_request, + args, + nargs, + servant_upcall, + exceptions, + nexceptions + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -283,22 +241,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( exceptions, nexceptions); + TAO::PICurrent_Guard pi_guard (server_request, + true /* Copy TSC to RSC */); + ACE_TRY { - bool is_remote_request = !server_request.collocated (); - for (size_t i = 0; i < server_request.interceptor_count (); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_request (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor(i)->receive_request ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; // Note that no interceptors are pushed on to or popped off // of the flow stack in this interception point since it is @@ -336,8 +289,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply ( // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. - bool is_remote_request = !server_request.collocated (); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" // interception point. @@ -359,17 +310,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply ( // invoked in another "ending" interception point. --server_request.interceptor_count (); - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - server_request.interceptor_count ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_reply (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + this->interceptor_list_.interceptor ( + server_request.interceptor_count ())->send_reply ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } // The send_reply() interception point does not raise a @@ -390,8 +335,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. - bool is_remote_request = !server_request.collocated (); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" server // side interception point. @@ -415,17 +358,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( // being invoked in another "ending" interception point. --server_request.interceptor_count (); - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - server_request.interceptor_count ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_exception (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor ( + server_request.interceptor_count ())->send_exception ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) @@ -491,8 +428,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. - bool is_remote_request = !server_request.collocated (); - TAO::ServerRequestInfo request_info (server_request, args, nargs, @@ -516,17 +451,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( // being invoked in another "ending" interception point. --server_request.interceptor_count (); - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - server_request.interceptor_count ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_other (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor( + server_request.interceptor_count ())->send_other ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) @@ -546,6 +475,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( ACE_CHECK; } + void TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor @@ -555,17 +485,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( } void -TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) -{ - this->interceptor_list_.add_interceptor (interceptor, - policies - ACE_ENV_ARG_PARAMETER); -} - -void TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors ( ACE_ENV_SINGLE_ARG_DECL) { @@ -578,17 +497,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void) TAO::PICurrent_Impl *pi = 0; ACE_NEW_RETURN (pi, TAO::PICurrent_Impl, - pi); + 0); return pi; } TAO::PICurrent_Copy_Callback * TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current_callback (void) { - TAO::PICurrent_Copy_Callback * pi = 0; + TAO::PICurrent_Copy_Callback *pi = 0; ACE_NEW_RETURN (pi, TAO::PICurrent_Copy_Callback, - pi); + 0); return pi; } @@ -601,25 +520,24 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current ( void TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current_callback ( - TAO::PICurrent_Copy_Callback * callback) + TAO::PICurrent_Copy_Callback *callback) { delete callback; } void TAO::ServerRequestInterceptor_Adapter_Impl::execute_command ( - TAO_ServerRequest & server_request, - TAO::Upcall_Command & command + TAO_ServerRequest &server_request, + TAO::Upcall_Command &command ACE_ENV_ARG_DECL) { - TAO::PICurrent_Guard const pi_guard (server_request, - true /* Copy TSC to RSC */); + TAO::PICurrent_Guard pi_guard (server_request, + true /* Copy TSC to RSC */); // The actual upcall. command.execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index b9217c4ac50..6fa2e115b6c 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -20,37 +20,28 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/orbconf.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI_Server/ServerRequestInterceptorC.h" +#include "ServerRequestInterceptorC.h" #include "tao/PI/Interceptor_List_T.h" #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/Basic_Types.h" -#include "tao/PI_Server/ServerRequestDetails.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor, - ServerRequestDetails> + typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor> ServerRequestInterceptor_List; } -namespace CORBA -{ - class PolicyList; -} - class TAO_ServerRequest; namespace TAO @@ -65,8 +56,8 @@ namespace TAO * A convenient helper class to invoke registered server request * interceptor(s). */ - class ServerRequestInterceptor_Adapter_Impl - : public ServerRequestInterceptor_Adapter + class TAO_PI_Server_Export ServerRequestInterceptor_Adapter_Impl : + public ServerRequestInterceptor_Adapter { public: @@ -161,11 +152,6 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL); - virtual void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); virtual TAO::PICurrent_Impl *allocate_pi_current (void); @@ -192,8 +178,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp deleted file mode 100644 index 3bc4852ec1a..00000000000 --- a/TAO/tao/PI_Server/ServerRequestDetails.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "tao/PI_Server/ServerRequestDetails.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#if !defined (__ACE_INLINE__) -#include "tao/PI_Server/ServerRequestDetails.inl" -#endif /* defined INLINE */ - -ACE_RCSID (PI_Server, - ServerRequestDetails, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - void - ServerRequestDetails::apply_policies ( - const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) - { - // Flag to check for duplicate ProcessingModePolicy objects in the list. - bool processing_mode_applied = false; - - const CORBA::ULong plen = policies.length (); - - for (CORBA::ULong i = 0; i < plen; ++i) - { - CORBA::Policy_var policy = policies[i]; - - if (CORBA::is_nil (policy.in ())) - { - // Just ignore nil policies... - continue; - } - - // Obtain the PolicyType from the current Policy object. - const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) - { - if (processing_mode_applied) - { - // This is the second time we have run into this policy type, - // and that is not allowed. - ACE_THROW (CORBA::INV_POLICY ()); - } - - // Flip the flag to true in order to trap any dupes. - processing_mode_applied = true; - - // Narrow the Policy to the ProcessingModePolicy interface. - PortableInterceptor::ProcessingModePolicy_var pm_policy = - PortableInterceptor::ProcessingModePolicy::_narrow ( - policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Save the value of the ProcessingModePolicy in our data member. - this->processing_mode_ = - pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } - else - { - // We don't support the current policy type. - ACE_THROW (CORBA::INV_POLICY ()); - } - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h deleted file mode 100644 index fc34a6a66f5..00000000000 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ServerRequestDetails.h - * - * $Id$ - * - * This file declares a class that manages the details - * about a registered server request interceptor. Policies can be - * used when interceptors are registered, and the policy values - * will be processed and used to modify the values of the - * ServerRequestDetails object associated with the registered - * server request interceptor. - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_SERVER_REQUEST_DETAILS_H -#define TAO_SERVER_REQUEST_DETAILS_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/ProcessingModePolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - /** - * @class ServerRequestDetails - * - * @brief The policy-driven details for a registered server request - * interceptor - * - * Each time a server request interceptor is registered with an ORB, - * a ServerRequestDetails object will be created and associated with - * the registered server request interceptor. If the interceptor is - * registered with policies, the policies will be used to adjust the - * values in the ServerRequestDetails appropriately. - */ - class ServerRequestDetails - { - public: - ServerRequestDetails (void); - - void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - - /// Returns true if the ProcessingMode setting permits the "firing" - /// of the associated server request interceptor based upon the - /// remote vs. collocated nature of the current servant request - /// that is being dispatched. - bool should_be_processed (bool is_remote_request) const; - - private: - - /// The ProcessingMode setting that can be adjusted via the - /// PortableInterceptor::ProcessingModePolicy. - PortableInterceptor::ProcessingMode processing_mode_; - }; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "tao/PI_Server/ServerRequestDetails.inl" -#endif /* __ACE_INLINE__ */ - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_SERVER_REQUEST_DETAILS_H */ diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl deleted file mode 100644 index f653264bdac..00000000000 --- a/TAO/tao/PI_Server/ServerRequestDetails.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - ACE_INLINE - ServerRequestDetails::ServerRequestDetails (void) - : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) - { - } - - ACE_INLINE - bool - ServerRequestDetails::should_be_processed (bool is_remote_request) const - { - return ((this->processing_mode_ == PortableInterceptor::LOCAL_AND_REMOTE) || - ((this->processing_mode_ == PortableInterceptor::REMOTE_ONLY) && - (is_remote_request)) || - ((this->processing_mode_ == PortableInterceptor::LOCAL_ONLY) && - (!is_remote_request))); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index b0b50f027d2..2b613ec3738 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "tao/PI_Server/ServerRequestInfo.h" +#include "ServerRequestInfo.h" #if (TAO_HAS_INTERCEPTORS == 1) -ACE_RCSID (PI_Server, +ACE_RCSID (PortableServer, ServerRequestInfo, "$Id$") @@ -26,10 +26,9 @@ ACE_RCSID (PI_Server, #include "ace/OS_NS_string.h" # if !defined (__ACE_INLINE__) -# include "tao/PI_Server/ServerRequestInfo.inl" +# include "ServerRequestInfo.inl" # endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -587,6 +586,4 @@ TAO::ServerRequestInfo::add_reply_service_context ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index afce3a85690..7b79d9eed83 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -27,7 +27,8 @@ #if (TAO_HAS_INTERCEPTORS == 1) -#include "tao/PI_Server/ServerRequestInfoC.h" +#include "pi_server_export.h" +#include "ServerRequestInfoC.h" #include "tao/LocalObject.h" #include "tao/OctetSeqC.h" #include "tao/TAO_Server_Request.h" @@ -39,8 +40,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ServerRequest; class TAO_Service_Context; @@ -66,9 +65,9 @@ namespace TAO * @note This class is currently not meant to be reference counted * since it is instantiated on the stack. */ - class ServerRequestInfo - : public virtual PortableInterceptor::ServerRequestInfo - , public virtual CORBA::LocalObject + class TAO_PI_Server_Export ServerRequestInfo + : public virtual PortableInterceptor::ServerRequestInfo, + public virtual CORBA::LocalObject { public: @@ -299,10 +298,9 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL # if defined (__ACE_INLINE__) -# include "tao/PI_Server/ServerRequestInfo.inl" +# include "ServerRequestInfo.inl" # endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl index 09985532ba8..3ba06ed412b 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.inl +++ b/TAO/tao/PI_Server/ServerRequestInfo.inl @@ -5,8 +5,6 @@ #include "tao/PortableServer/Servant_Upcall.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::ServerRequestInfo::ServerRequestInfo ( TAO_ServerRequest & server_request, @@ -56,5 +54,3 @@ TAO::ServerRequestInfo::server_request (void) return this->server_request_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl index d8a4c52639d..9670dd42b02 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.pidl +++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl @@ -23,8 +23,8 @@ #define _SERVER_REQUESTINFO_PIDL_ #include "tao/PI/RequestInfo.pidl" -#include "tao/orb_types.pidl" -#include "tao/Policy_Forward.pidl" +#include <orb_types.pidl> +#include <Policy_Forward.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp index 94ad278401d..1dc8ac2a761 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp @@ -25,29 +25,26 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI_Server/ServerRequestInfoA.h" +#include "ServerRequestInfoC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ServerRequestInfo ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0", "ServerRequestInfo"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo = @@ -55,4 +52,78 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInfo_ptr _tao_elem + ) +{ + PortableInterceptor::ServerRequestInfo_ptr _tao_objptr = + PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInfo_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert ( + _tao_any, + PortableInterceptor::ServerRequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInfo, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInfo_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract ( + _tao_any, + PortableInterceptor::ServerRequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInfo, + _tao_elem + ); +} diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.h b/TAO/tao/PI_Server/ServerRequestInfoA.h deleted file mode 100644 index 1766f29ea93..00000000000 --- a/TAO/tao/PI_Server/ServerRequestInfoA.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_SERVERREQUESTINFOA_H_ -#define _TAO_IDL_SERVERREQUESTINFOA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI_Server/pi_server_export.h" -#include "tao/PI_Server/ServerRequestInfoC.h" -#include "tao/PI/RequestInfoA.h" -#include "tao/AnyTypeCode/orb_typesA.h" -#include "tao/AnyTypeCode/Policy_ForwardA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp index 69fcd9ec298..eab818b9b7f 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp @@ -26,19 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI_Server/ServerRequestInfoC.h" +#include "ServerRequestInfoC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -72,13 +74,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void) return PortableInterceptor::ServerRequestInfo::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal ( PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) @@ -87,9 +89,17 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void) {} +void +PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer) +{ + ServerRequestInfo *_tao_tmp_pointer = + static_cast<ServerRequestInfo *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -100,7 +110,7 @@ PortableInterceptor::ServerRequestInfo::_narrow ( PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -126,7 +136,7 @@ PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInfo::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -164,10 +174,8 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h index bcefdc89906..6cbeedeb0dc 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.h +++ b/TAO/tao/PI_Server/ServerRequestInfoC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_SERVERREQUESTINFOC_H_ -#define _TAO_IDL_SERVERREQUESTINFOC_H_ +#ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_ +#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_ #include /**/ "ace/pre.h" @@ -41,13 +41,14 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/pi_server_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/Objref_VarOut_T.h" #include "tao/PI/RequestInfoC.h" @@ -59,29 +60,36 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Server_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_ - + class ServerRequestInfo; typedef ServerRequestInfo *ServerRequestInfo_ptr; - + typedef TAO_Objref_Var_T< ServerRequestInfo > ServerRequestInfo_var; - + typedef TAO_Objref_Out_T< ServerRequestInfo @@ -89,187 +97,192 @@ namespace PortableInterceptor ServerRequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_ - + class TAO_PI_Server_Export ServerRequestInfo : public virtual ::PortableInterceptor::RequestInfo { public: typedef ServerRequestInfo_ptr _ptr_type; typedef ServerRequestInfo_var _var_type; - + // The static operations. static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj); - + static void _tao_release (ServerRequestInfo_ptr obj); - + static ServerRequestInfo_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _nil (void) { return static_cast<ServerRequestInfo_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * sending_exception ( + + virtual CORBA::Any * sending_exception ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::ObjectId * object_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * adapter_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_server_policy ( ::CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_slot ( ::PortableInterceptor::SlotId id, const ::CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Boolean target_is_a ( + + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_reply_service_context ( const ::IOP::ServiceContext & service_context, ::CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. ServerRequestInfo (void); - + virtual ~ServerRequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. ServerRequestInfo (const ServerRequestInfo &); - + void operator= (const ServerRequestInfo &); }; #endif /* end #if !defined */ + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; + // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -280,9 +293,9 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_ + template<> struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo> { @@ -293,7 +306,7 @@ namespace TAO ::PortableInterceptor::ServerRequestInfo_ptr ); static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -303,9 +316,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying +TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl index 571b35e9c73..1235962e161 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl +++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl @@ -28,7 +28,7 @@ #include "tao/PI/Interceptor.pidl" #include "tao/PI/PIForwardRequest.pidl" -#include "tao/OctetSeq.pidl" +#include <OctetSeq.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp index 8f5dfb63340..58a08ac8132 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp @@ -25,29 +25,26 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI_Server/ServerRequestInterceptorA.h" +#include "ServerRequestInterceptorC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ServerRequestInterceptor ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0", "ServerRequestInterceptor"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor = @@ -55,4 +52,78 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem + ) +{ + PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr = + PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert ( + _tao_any, + PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInterceptor, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract ( + _tao_any, + PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInterceptor, + _tao_elem + ); +} diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h deleted file mode 100644 index 6ed94797f14..00000000000 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_ -#define _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI_Server/pi_server_export.h" -#include "tao/PI_Server/ServerRequestInterceptorC.h" -#include "tao/PI/InterceptorA.h" -#include "tao/PI/PIForwardRequestA.h" -#include "tao/AnyTypeCode/OctetSeqA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index db1e8a5d4e2..82e30f3c415 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -26,19 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI_Server/ServerRequestInterceptorC.h" +#include "ServerRequestInterceptorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -72,13 +74,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) return PortableInterceptor::ServerRequestInterceptor::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) @@ -87,9 +89,17 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) {} +void +PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer) +{ + ServerRequestInterceptor *_tao_tmp_pointer = + static_cast<ServerRequestInterceptor *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -100,7 +110,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow ( PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -126,7 +136,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -164,10 +174,8 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index ec784b9d706..826741ec9e6 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_ -#define _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_ +#ifndef _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_ +#define _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_ #include /**/ "ace/pre.h" @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/pi_server_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -56,16 +57,23 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Server_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_ @@ -88,7 +96,7 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_ @@ -129,12 +137,12 @@ namespace PortableInterceptor static void _tao_release (ServerRequestInterceptor_ptr obj); static ServerRequestInterceptor_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServerRequestInterceptor_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -143,7 +151,7 @@ namespace PortableInterceptor return static_cast<ServerRequestInterceptor_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -156,7 +164,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) {} @@ -170,7 +178,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; @@ -182,7 +190,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; @@ -194,61 +202,66 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_exception ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_other ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. ServerRequestInterceptor (void); - + virtual ~ServerRequestInterceptor (void); - + private: // Private and unimplemented for concrete interfaces. ServerRequestInterceptor (const ServerRequestInterceptor &); - + void operator= (const ServerRequestInterceptor &); }; #endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -259,9 +272,9 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_ + template<> struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo> { @@ -272,7 +285,7 @@ namespace TAO ::PortableInterceptor::ServerRequestInfo_ptr ); static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -280,9 +293,9 @@ namespace TAO #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_ + template<> struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor> { @@ -293,7 +306,7 @@ namespace TAO ::PortableInterceptor::ServerRequestInterceptor_ptr ); static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -303,9 +316,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying +TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index 37b51488606..f3d26ea86be 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -11,11 +11,11 @@ */ // ================================================================= -#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h" +#include "ServerRequestInterceptor_Factory_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI_Server/ServerInterceptorAdapter.h" +#include "ServerInterceptorAdapter.h" #include "tao/ORB.h" #include "tao/debug.h" @@ -24,9 +24,6 @@ ACE_RCSID (PI_Server, PolicyFactory_Loader, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ServerRequestInterceptor_Adapter* TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) { @@ -37,8 +34,6 @@ TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl, ACE_TEXT ("ServerRequestInterceptor_Adapter_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 9cd5e06128f..45e80d4c25e 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -16,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,8 +30,6 @@ #include "ace/Service_Config.h" #include "tao/ServerRequestInterceptor_Adapter_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class ServerRequestInterceptor_Adapter; @@ -43,8 +42,6 @@ public: virtual TAO::ServerRequestInterceptor_Adapter *create (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_ServerRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PI_Server/diffs/ServerRequestInterceptor.diff b/TAO/tao/PI_Server/diffs/ServerRequestInterceptor.diff deleted file mode 100644 index f3fc423c81a..00000000000 --- a/TAO/tao/PI_Server/diffs/ServerRequestInterceptor.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- orig/ServerRequestInterceptorC.h 2005-05-17 13:50:41.646918400 +0200 -+++ ServerRequestInterceptorC.h 2005-05-17 14:00:40.237649600 +0200 -@@ -155,15 +155,19 @@ - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - -+#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 -+ - virtual void tao_ft_interception_point ( - ::PortableInterceptor::ServerRequestInfo_ptr ri, - ::CORBA::OctetSeq_out os -- ACE_ENV_ARG_DECL_WITH_DEFAULTS -+ ACE_ENV_ARG_DECL_NOT_USED - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ::PortableInterceptor::ForwardRequest -- )) = 0; -+ )) {} -+ -+#endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS */ - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 |